diff --git a/.maestro/tests/account/login.yaml b/.maestro/tests/account/login.yaml
index f3f584ef76..0661a30981 100644
--- a/.maestro/tests/account/login.yaml
+++ b/.maestro/tests/account/login.yaml
@@ -9,29 +9,35 @@ appId: ${MAESTRO_APP_ID}
     id: "login-continue"
 ## MAS page
 ## Conditional workflow to pass the Chrome first launch welcome page.
-- runFlow:
-    when:
-      visible: 'Use without an account'
+- retry:
+    maxRetries: 3
     commands:
-      - tapOn: "Use without an account"
-## For older chrome versions
-- runFlow:
-    when:
-      visible: 'Accept & continue'
-    commands:
-      - tapOn: "Accept & continue"
-- runFlow:
-    when:
-      visible: 'No thanks'
-    commands:
-      - tapOn: "No thanks"
+      - runFlow:
+          when:
+            visible: 'Use without an account'
+          commands:
+            - tapOn: "Use without an account"
+      ## For older chrome versions
+      - runFlow:
+          when:
+            visible: 'Accept & continue'
+          commands:
+            - tapOn: "Accept & continue"
+      - runFlow:
+          when:
+            visible: 'No thanks'
+          commands:
+            - tapOn: "No thanks"
 ## Working when running Maestro locally, but not on the CI yet.
-- extendedWaitUntil:
-      visible:
-        id: "form-1"
-      timeout: 10000
+- retry:
+    maxRetries: 3
+    commands:
+      - extendedWaitUntil:
+          visible:
+            id: "form-1"
+          timeout: 10000
 - tapOn:
-   id: "form-1"
+    id: "form-1"
 - inputText: ${MAESTRO_USERNAME}
 - pressKey: Enter
 - tapOn:
diff --git a/.maestro/tests/roomList/createAndDeleteDM.yaml b/.maestro/tests/roomList/createAndDeleteDM.yaml
index 7e33fd1d15..e80dc377b5 100644
--- a/.maestro/tests/roomList/createAndDeleteDM.yaml
+++ b/.maestro/tests/roomList/createAndDeleteDM.yaml
@@ -13,3 +13,8 @@ appId: ${MAESTRO_APP_ID}
 - scroll
 - tapOn: "Leave room"
 - tapOn: "Leave"
+- runFlow:
+    when:
+      visible: 'You need an invite in order to join'
+    commands:
+      - tapOn: "Back"
diff --git a/.maestro/tests/roomList/createAndDeleteRoom.yaml b/.maestro/tests/roomList/createAndDeleteRoom.yaml
index a72fb80075..d0b17133d5 100644
--- a/.maestro/tests/roomList/createAndDeleteRoom.yaml
+++ b/.maestro/tests/roomList/createAndDeleteRoom.yaml
@@ -3,9 +3,9 @@ appId: ${MAESTRO_APP_ID}
 # Purpose: Test the creation and deletion of a room
 - tapOn: "Create a new conversation or room"
 - tapOn: "New room"
-- tapOn: "e.g. your project name"
+- tapOn: "Add name…"
 - inputText: "aRoomName"
-- tapOn: "What is this room about?"
+- tapOn: "Add description…"
 - inputText: "aRoomTopic"
 - tapOn: "Create"
 - takeScreenshot: build/maestro/320-createAndDeleteRoom
@@ -37,3 +37,8 @@ appId: ${MAESTRO_APP_ID}
 - scroll
 - tapOn: "Leave room"
 - tapOn: "Leave"
+- runFlow:
+    when:
+      visible: 'You need an invite in order to join'
+    commands:
+      - tapOn: "Back"