diff --git a/e2e/jest.config.js b/e2e/jest.config.js
index 6add52040..061d3940a 100644
--- a/e2e/jest.config.js
+++ b/e2e/jest.config.js
@@ -2,7 +2,7 @@
 module.exports = {
 	rootDir: '..',
 	setupFilesAfterEnv: ['<rootDir>/e2e/tests/init.ts'],
-	testMatch: ['<rootDir>/e2e/tests/**/*.spec.ts'],
+	testMatch: ['<rootDir>/e2e/tests/onboarding/05-login.spec.ts'],
 	testTimeout: 120000,
 	maxWorkers: 1,
 	globalSetup: 'detox/runners/jest/globalSetup',
diff --git a/e2e/tests/assorted/08-joinprotectedroom.spec.ts b/e2e/tests/assorted/08-joinprotectedroom.spec.ts
index fcfdea5d5..931b538e5 100644
--- a/e2e/tests/assorted/08-joinprotectedroom.spec.ts
+++ b/e2e/tests/assorted/08-joinprotectedroom.spec.ts
@@ -20,6 +20,7 @@ async function openJoinCode() {
 		.toExist()
 		.withTimeout(2000);
 	let n = 0;
+	// FIXME: this while is always matching 3 loops
 	while (n < 3) {
 		try {
 			await element(by.id('room-view-join-button')).tap();
diff --git a/e2e/tests/onboarding/05-login.spec.ts b/e2e/tests/onboarding/05-login.spec.ts
index ed538b3e0..62f641fb9 100644
--- a/e2e/tests/onboarding/05-login.spec.ts
+++ b/e2e/tests/onboarding/05-login.spec.ts
@@ -52,10 +52,23 @@ describe('Login screen', () => {
 		});
 
 		it('should navigate to forgot password', async () => {
-			await element(by.id('login-view-forgot-password')).tap();
-			await waitFor(element(by.id('forgot-password-view')))
-				.toExist()
+			await expect(element(by.id('login-view-more'))).toBeVisible();
+			await waitFor(element(by.id('login-view-forgot-password')))
+				.toBeVisible()
 				.withTimeout(2000);
+
+			let n = 0;
+			while (n < 3) {
+				try {
+					await element(by.id('login-view-forgot-password')).tap();
+					await waitFor(element(by.id('forgot-password-view')))
+						.toExist()
+						.withTimeout(2000);
+					n = 3;
+				} catch (error) {
+					n += 1;
+				}
+			}
 			await tapBack();
 		});
 
diff --git a/ios/.xcode.env.local b/ios/.xcode.env.local
deleted file mode 100644
index 54f2cc7fc..000000000
--- a/ios/.xcode.env.local
+++ /dev/null
@@ -1 +0,0 @@
-export NODE_BINARY="/Users/diegomello/.nvm/versions/node/v14.20.0/bin/node"