diff --git a/compas/docker-compose-postgresql.yml b/compas/docker-compose-postgresql.yml
index 3bcf452..54ccaa3 100644
--- a/compas/docker-compose-postgresql.yml
+++ b/compas/docker-compose-postgresql.yml
@@ -151,7 +151,7 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.33.0.7"
+    image: "lfenergy/compas-open-scd:v0.35.0.1"
     depends_on:
       - scl-data-service
       - cim-mapping
diff --git a/integration-testing/TestSuite004-auto-alignment.robot b/integration-testing/TestSuite004-auto-alignment.robot
index 1107025..9190254 100644
--- a/integration-testing/TestSuite004-auto-alignment.robot
+++ b/integration-testing/TestSuite004-auto-alignment.robot
@@ -10,7 +10,7 @@ Test Setup      Initialize and Start OpenSCD
 Test Teardown   Make screenshot and Stop OpenSCD
 
 *** Variables ***
-${single-line-diagram-selector}   oscd-plugin5f1cbbcb9fada7d8
+${single-line-diagram-selector}   oscd-plugin54a33cdb5f615be0
 
 ${substation1}                    _af9a4ae3-ba2e-4c34-8e47-5af894ee20f4
 ${substation1VoltageLevel}        ${substation1}>S1 110kV
diff --git a/integration-testing/include/general-openscd.robot b/integration-testing/include/general-openscd.robot
index 0cc735c..535ffdb 100644
--- a/integration-testing/include/general-openscd.robot
+++ b/integration-testing/include/general-openscd.robot
@@ -8,7 +8,8 @@ Resource        ./general-config.robot
 
 *** Variables ***
 # Variables of Selectors commonly used.
-${menu-selector}                mwc-drawer[id="menu"]
+${menu-selector}                mwc-drawer[id='menu']
+${menu-button}                  mwc-icon-button[label="Menu"]
 ${nav-selector}                 mwc-top-app-bar-fixed
 ${dialog-selector}              wizard-dialog
 ${substation-editor-selector}   substation-editor:first-child > action-pane
@@ -42,7 +43,7 @@ Check Browser Title
 
 Open Menu
     [Arguments]     ${menuItemTitle}
-    Click           ${menu-selector} mwc-icon-button[label="Menu"] > button
+    Click           ${menu-button} > button
     Click           ${menu-selector} mwc-list > mwc-list-item >> span:text-is("${menuItemTitle}")
 
 Open Navigation Menu
@@ -93,14 +94,14 @@ Save to local file
 
 Check Title Filename
     [Arguments]     ${filename}     ${scltype}
-    Get Text        open-scd > mwc-drawer div#title   ==   ${filename}.${scltype.lower()}
+    Get Text        compas-layout > mwc-drawer span[slot="subtitle"]   ==   ${filename}.${scltype.lower()}
 
 Wait for dialog is closed
     Wait until executed
     Wait For Elements State   ${dialog-selector}   hidden
 
 Wait until executed
-    Wait For Function         element => element.className.indexOf('mdc-linear-progress--closed') >= 0   open-scd > mwc-linear-progress > div[role="progressbar"]   timeout=30s
+    Wait For Function         element => element.className.indexOf('mdc-linear-progress--closed') >= 0   oscd-waiter > mwc-linear-progress > div[role="progressbar"]   timeout=30s
 
 Close Issues Snackbar
     ${snackbarVisible}=   Get Element States   mwc-snackbar#issue > mwc-icon-button[slot="dismiss"] > button    *=    visible