diff --git a/.maestro/tests/assorted/join-from-directory.yaml b/.maestro/tests/assorted/join-from-directory.yaml
index df84972bf4..edeaae617d 100644
--- a/.maestro/tests/assorted/join-from-directory.yaml
+++ b/.maestro/tests/assorted/join-from-directory.yaml
@@ -41,7 +41,6 @@ tags:
 - tapOn:
     id: 'directory-view-search'
 - inputText: join-from-directory
-- pressKey: Enter
 - extendedWaitUntil:
     visible:
       id: 'directory-view-item-join-from-directory'
@@ -103,7 +102,11 @@ tags:
 - tapOn:
     id: 'directory-view-search'
 - inputText: ${output.otherUser.username}
-- pressKey: Enter
+- runFlow:
+    when:
+      platform: iOS
+    commands:
+      - pressKey: enter
 - extendedWaitUntil:
     visible:
       id: 'directory-view-item-${output.otherUser.username}'
@@ -147,7 +150,6 @@ tags:
 - tapOn:
     id: 'directory-view-search'
 - inputText: ${output.team}
-- pressKey: Enter
 - extendedWaitUntil:
     visible:
       id: 'directory-view-item-${output.team}'
diff --git a/.maestro/tests/assorted/setting.yaml b/.maestro/tests/assorted/setting.yaml
index e159d44a57..e599125323 100644
--- a/.maestro/tests/assorted/setting.yaml
+++ b/.maestro/tests/assorted/setting.yaml
@@ -104,8 +104,12 @@ tags:
     visible:
       id: 'settings-view'
     timeout: 60000
-- assertVisible:
-    id: 'settings-view-clear-cache'
+- waitForAnimationToEnd:
+    timeout: 60000
+- extendedWaitUntil:
+    visible:
+      id: 'settings-view-clear-cache'
+    timeout: 60000
 - tapOn:
     id: 'settings-view-clear-cache'
     retryTapIfNoChange: true
diff --git a/.maestro/tests/room/jump-to-message.yaml b/.maestro/tests/room/jump-to-message.yaml
index bfe651f52c..2d330c4217 100644
--- a/.maestro/tests/room/jump-to-message.yaml
+++ b/.maestro/tests/room/jump-to-message.yaml
@@ -108,8 +108,7 @@ tags:
       id: 'message-content-30'
     timeout: 60000
 - tapOn:
-    text: '30'
-    index: 1
+    id: 'message-content-30'
 - extendedWaitUntil:
     visible:
       id: 'message-content-29'
diff --git a/app/containers/InAppNotification/index.tsx b/app/containers/InAppNotification/index.tsx
index 503e284eac..870076e382 100644
--- a/app/containers/InAppNotification/index.tsx
+++ b/app/containers/InAppNotification/index.tsx
@@ -59,7 +59,7 @@ const InAppNotification = memo(() => {
 				componentProps: {
 					notification
 				},
-				duration: notification.customTime || 3000, // default 3s,
+				duration: notification.customTime || process.env.RUNNING_E2E_TESTS ? 60000 : 3000, // default 3s,
 				hideOnPress: notification.hideOnPress ?? true,
 				swipeEnabled: notification.swipeEnabled ?? true
 			});