diff --git a/.maestro/tests/roomList/createAndDeleteRoom.yaml b/.maestro/tests/roomList/createAndDeleteRoom.yaml
index 6b4d745fae..bee23613b9 100644
--- a/.maestro/tests/roomList/createAndDeleteRoom.yaml
+++ b/.maestro/tests/roomList/createAndDeleteRoom.yaml
@@ -8,6 +8,12 @@ appId: ${MAESTRO_APP_ID}
 - tapOn: "Add description…"
 - inputText: "aRoomTopic"
 - tapOn: "Create"
+
+# It can take ages to create room on matrix.org
+- extendedWaitUntil:
+    timeout: 30000
+    visible: "Invite people"
+
 - takeScreenshot: build/maestro/320-createAndDeleteRoom
 - tapOn: "Search for someone"
 - inputText: ${MAESTRO_INVITEE1_MXID}
diff --git a/.maestro/tests/settings/settings.yaml b/.maestro/tests/settings/settings.yaml
index 21ff077908..e016bd468c 100644
--- a/.maestro/tests/settings/settings.yaml
+++ b/.maestro/tests/settings/settings.yaml
@@ -5,6 +5,33 @@ appId: ${MAESTRO_APP_ID}
 - assertVisible: "Settings"
 - takeScreenshot: build/maestro/600-Settings
 
+## Account settings
+- tapOn:
+    id: "settings-user_profile"
+- assertVisible: "Edit profile"
+- takeScreenshot: build/maestro/610-AccountEditProfile
+- back
+
+- tapOn:
+    text: "Notifications"
+- assertVisible: "Enable notifications on this device"
+- back
+
+- tapOn:
+    text: "Encryption"
+- assertVisible: "Key storage"
+- back
+
+- tapOn:
+    text: "Moderation & safety"
+- assertVisible: "Your appearance"
+- back
+
+- tapOn:
+    text: "Report a problem"
+- assertVisible: "Report a problem"
+- back
+
 ## App settings section
 - assertVisible: "Appearance"
 
@@ -19,22 +46,38 @@ appId: ${MAESTRO_APP_ID}
 - hideKeyboard
 - back
 
+- scrollUntilVisible:
+    direction: DOWN
+    element:
+      text: "Location sharing"
 - tapOn:
     text: "Location sharing"
 - assertVisible: "Live location updates"
 - back
 
 ## General section
+- scrollUntilVisible:
+    direction: DOWN
+    element:
+      text: "Analytics"
 - tapOn:
     text: "Analytics"
 - assertVisible: "Share analytics data"
 - back
 
+- scrollUntilVisible:
+    direction: DOWN
+    element:
+      text: "Labs"
 - tapOn:
     text: "Labs"
 - assertVisible: "Feeling experimental?"
 - back
 
+- scrollUntilVisible:
+    direction: DOWN
+    element:
+      text: "About"
 - tapOn:
     text: "About"
 - assertVisible: "Copyright"
@@ -42,33 +85,15 @@ appId: ${MAESTRO_APP_ID}
 - assertVisible: "Privacy policy"
 - back
 
+- scrollUntilVisible:
+    direction: DOWN
+    element:
+      text: "Developer options"
 - tapOn:
     text: "Developer options"
 - assertVisible: "Feature flags"
 - assertVisible: "View source"
 - back
 
-## Account settings
-- tapOn:
-    id: "settings-user_profile"
-- assertVisible: "Your account"
-- takeScreenshot: build/maestro/610-AccountSettings
-
-- tapOn:
-    text: "Notifications"
-- assertVisible: "Enable notifications on this device"
-- back
-
-- tapOn:
-    text: "Moderation & safety"
-- assertVisible: "Your appearance"
-- back
-
-- tapOn:
-    text: "Report a problem"
-- assertVisible: "Report a problem"
-- back
-
-- back
 - back
 - runFlow: ../assertions/assertHomeDisplayed.yaml