diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b3940f09..6e88af12b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -484,7 +484,7 @@ jobs:
       - run:
           name: Build Android
           command: |
-            yarn detox build --configuration android.att.release
+            yarn e2e:android-build
       - save_cache: *save-gradle-cache
       - store_artifacts:
           path: android/app/build/outputs/apk/experimentalPlay/release/app-experimental-play-release.apk
@@ -529,7 +529,7 @@ jobs:
       - run:
           name: Run Detox Tests
           command: |
-            yarn detox test --configuration android.emu.release --cleanup --headless --take-screenshots failing
+            yarn e2e:android-test
       - store_artifacts:
           path: artifacts
 
@@ -562,11 +562,11 @@ jobs:
             /usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey $BUGSNAG_KEY" ./ios/RocketChatRN/Info.plist
             /usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey $BUGSNAG_KEY" ./ios/ShareRocketChatRN/Info.plist
             yarn detox clean-framework-cache && yarn detox build-framework-cache
-            yarn detox build --configuration ios.sim.release
+            yarn e2e:ios-build
       - run:
           name: Run tests
           command: |
-            yarn detox test --configuration ios.sim.release --cleanup --headless --take-screenshots failing
+            yarn e2e:ios-test
       - store_artifacts:
           path: artifacts
 
diff --git a/package.json b/package.json
index 9d87e5e58..226c2dce7 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,11 @@
 		"generate-source-maps-ios": "react-native bundle --platform ios --dev false --entry-file index.js --bundle-output ios-release.bundle --sourcemap-output ios-release.bundle.map",
 		"postinstall": "patch-package && jetify",
 		"prepare": "husky install",
-		"build-icon-set": "node scripts/build-icon-set.js"
+		"build-icon-set": "node scripts/build-icon-set.js",
+		"e2e:android-build": "yarn detox build -c android.emu.release",
+		"e2e:android-test": "yarn detox test -c android.emu.release --cleanup --headless --take-screenshots failing",
+		"e2e:ios-build": "yarn detox build -c ios.sim.release",
+		"e2e:ios-test": "yarn detox test -c ios.sim.release --cleanup --headless --take-screenshots failing"
 	},
 	"lint-staged": {
 		"*.{js,ts,tsx}": [