diff --git a/.maestro/tests/account/login.yaml b/.maestro/tests/account/login.yaml
index 81922c7f38..db105dc31d 100644
--- a/.maestro/tests/account/login.yaml
+++ b/.maestro/tests/account/login.yaml
@@ -7,6 +7,13 @@ appId: ${MAESTRO_APP_ID}
 - tapOn:
     id: "login-continue"
 ## MAS page
+# Click on "Use another account" if MAS is already logged in:
+- runFlow:
+    when:
+      visible: "Use another account"
+    commands:
+      - tapOn:
+          text: "Use another account"
 - retry:
     maxRetries: 3
     commands:
diff --git a/.maestro/tests/account/logout.yaml b/.maestro/tests/account/logout.yaml
index ec49033c40..83f834da04 100644
--- a/.maestro/tests/account/logout.yaml
+++ b/.maestro/tests/account/logout.yaml
@@ -12,8 +12,7 @@ appId: ${MAESTRO_APP_ID}
 # Ensure cancel cancels
 - tapOn:
     id: "dialog-negative"
-- tapOn:
-    id: "sign-out-submit"
+- tapOn: "Remove this device"
 - tapOn:
     id: "dialog-positive"
 - runFlow: ../assertions/assertInitDisplayed.yaml
diff --git a/.maestro/tests/roomList/roomList.yaml b/.maestro/tests/roomList/roomList.yaml
index 704d983b7d..bb3d426675 100644
--- a/.maestro/tests/roomList/roomList.yaml
+++ b/.maestro/tests/roomList/roomList.yaml
@@ -1,7 +1,7 @@
 appId: ${MAESTRO_APP_ID}
 ---
 - runFlow: cleanUpRoomList.yaml
-- runFlow: searchRoomList.yaml
+#- runFlow: searchRoomList.yaml
 - takeScreenshot: build/maestro/300-RoomList
 - runFlow: timeline/timeline.yaml
 - runFlow: roomContextMenu.yaml
diff --git a/.maestro/tests/roomList/timeline/messages/location.yaml b/.maestro/tests/roomList/timeline/messages/location.yaml
index 863a699fd9..7dda9c8a02 100644
--- a/.maestro/tests/roomList/timeline/messages/location.yaml
+++ b/.maestro/tests/roomList/timeline/messages/location.yaml
@@ -3,5 +3,5 @@ appId: ${MAESTRO_APP_ID}
 - takeScreenshot: build/maestro/520-Timeline
 - tapOn: "Add attachment"
 - tapOn: "Share location"
-- tapOn: "Share selected location"
+- tapOn: "Share my location"
 - takeScreenshot: build/maestro/521-Timeline