diff --git a/.detoxrc.js b/.detoxrc.js
index ead5b7803..3827ea71a 100644
--- a/.detoxrc.js
+++ b/.detoxrc.js
@@ -5,8 +5,13 @@ module.exports = {
 			$0: 'jest',
 			config: 'e2e/jest.config.js'
 		},
-		jest: {
-			setupTimeout: 120000
+		retries: 3
+	},
+	artifacts: {
+		plugins: {
+			screenshot: 'failing',
+			video: 'failing',
+			uiHierarchy: 'enabled'
 		}
 	},
 	apps: {
@@ -53,7 +58,8 @@ module.exports = {
 			type: 'android.emulator',
 			device: {
 				avdName: 'Pixel_API_31_AOSP'
-			}
+			},
+			headless: process.env.CI ? true : false
 		}
 	},
 	configurations: {
diff --git a/package.json b/package.json
index 9bf823a8c..191864d34 100644
--- a/package.json
+++ b/package.json
@@ -20,13 +20,13 @@
 		"prepare": "husky install",
 		"build-icon-set": "node scripts/build-icon-set.js",
 		"e2e:android-build-debug": "yarn detox build -c android.emu.debug",
-		"e2e:android-test-debug": "yarn detox test -c android.emu.debug --record-videos failing --take-screenshots failing",
+		"e2e:android-test-debug": "yarn detox test -c android.emu.debug",
 		"e2e:android-build": "yarn detox build -c android.emu.release",
-		"e2e:android-test": "yarn detox test -c android.emu.release --record-videos failing --take-screenshots failing -R 3",
-		"e2e:ios-build": "yarn detox build -c ios.sim.release",
-		"e2e:ios-test": "yarn detox test -c ios.sim.release --record-videos failing --take-screenshots failing -R 3",
+		"e2e:android-test": "yarn detox test -c android.emu.release",
 		"e2e:ios-build-debug": "yarn detox build -c ios.sim.debug",
-		"e2e:ios-test-debug": "yarn detox test -c ios.sim.debug --record-videos failing --take-screenshots failing"
+		"e2e:ios-test-debug": "yarn detox test -c ios.sim.debug",
+		"e2e:ios-build": "yarn detox build -c ios.sim.release",
+		"e2e:ios-test": "yarn detox test -c ios.sim.release"
 	},
 	"lint-staged": {
 		"*.{js,ts,tsx}": [