diff --git a/.circleci/config.yml b/.circleci/config.yml
index a0e2947e3..a40c9257e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -144,13 +144,6 @@ commands:
             fi
           working_directory: android/app
 
-      - run:
-          name: Metro Settings
-          command: |
-            if [[ $CIRCLE_JOB == "android-build-e2e" ]]; then
-              echo $METRO_CONFIG | base64 --decode > ./metro.config.js
-            fi
-
       - run:
           name: Build App
           no_output_timeout: 30m
@@ -162,7 +155,6 @@ commands:
               ./gradlew bundleExperimentalPlayRelease
             fi
             if [[ $CIRCLE_JOB == "android-build-e2e" ]]; then
-              ./gradlew app:assembleE2ePlayRelease -DtestBuildType=release
               ./gradlew app:assembleE2ePlayRelease app:assembleE2ePlayReleaseAndroidTest -DtestBuildType=release
             fi
             if [[ ! $KEYSTORE ]]; then
@@ -202,67 +194,12 @@ commands:
           paths:
             - android/app/build/outputs
 
-  android-build-e2e:
-    description: "Build Android app"
-    steps:
-      - checkout
-
-      - restore_cache: *restore-npm-cache-linux
-
-      - run: *install-npm-modules
-
-      - run:
-          name: Configure Gradle
-          command: |
-            echo -e "" > ./gradle.properties
-            # echo -e "android.enableAapt2=false" >> ./gradle.properties
-            echo -e "android.useAndroidX=true" >> ./gradle.properties
-            echo -e "android.enableJetifier=true" >> ./gradle.properties
-            echo -e "FLIPPER_VERSION=0.51.0" >> ./gradle.properties
-            echo -e "VERSIONCODE=$CIRCLE_BUILD_NUM" >> ./gradle.properties
-            echo -e "APPLICATION_ID=chat.rocket.reactnative" >> ./gradle.properties
-            echo -e "BugsnagAPIKey=$BUGSNAG_KEY" >> ./gradle.properties
-            echo $KEYSTORE_BASE64 | base64 --decode > ./app/$KEYSTORE
-            echo -e "KEYSTORE=$KEYSTORE" >> ./gradle.properties
-            echo -e "KEYSTORE_PASSWORD=$KEYSTORE_PASSWORD" >> ./gradle.properties
-            echo -e "KEY_ALIAS=$KEY_ALIAS" >> ./gradle.properties
-            echo -e "KEY_PASSWORD=$KEYSTORE_PASSWORD" >> ./gradle.properties
-          working_directory: android
-
-      - run:
-          name: Set Google Services
-          command: |
-            if [[ $KEYSTORE ]]; then
-              echo $GOOGLE_SERVICES_ANDROID | base64 --decode > google-services.json
-            fi
-          working_directory: android/app
-
-      - run:
-          name: Metro Settings
-          command: |
-              echo $METRO_CONFIG | base64 --decode > ./metro.config.js
-
-      - run:
-          name: Build App
-          no_output_timeout: 30m
-          command: |
-              ./gradlew app:assembleE2ePlayRelease app:assembleE2ePlayReleaseAndroidTest -DtestBuildType=release
-          working_directory: android
-
-      - store_artifacts:
-          path: android/app/build/outputs
-
-      - save_cache: *save-npm-cache-linux
-
-      - save_cache: *save-gradle-cache
-
-      - persist_to_workspace:
-          root: .
-          paths:
-            - android/app/build/outputs
-
   android-e2e-test:
     description: "End-to-End testing for Android using detox"
+    parameters:
+      folder:
+        type: string
+        default: ""
     steps:
       - checkout
 
@@ -289,7 +226,7 @@ commands:
       - run:
           name: Run the test
           command: |
-            yarn detox test -c and.emu.release --cleanup
+            yarn detox test <<parameters.folder>> -c and.emu.release --cleanup
 
   ios-build:
     description: "Build iOS app"
@@ -495,14 +432,14 @@ jobs:
   android-build-e2e:
     <<: *defaults
     docker:
-      - image: circleci/android:api-30-node
+      - image: circleci/android:api-29-node
     environment:
       <<: *android-env
       <<: *bash-env
     steps:
-      - android-build-e2e
+      - android-build
   
-  android-e2e-test:
+  android-e2e-test-assorted:
     <<: *defaults
     machine:
       image: android:202102-01
@@ -511,7 +448,44 @@ jobs:
       <<: *android-env
       <<: *bash-env
     steps:
-      - android-e2e-test
+      - android-e2e-test:
+          folder: "./e2e/tests/assorted/"
+
+  android-e2e-test-onboarding:
+    <<: *defaults
+    machine:
+      image: android:202102-01
+    resource_class: large
+    environment:
+      <<: *android-env
+      <<: *bash-env
+    steps:
+      - android-e2e-test:
+          folder: "./e2e/tests/onboarding/"
+
+  android-e2e-test-room:
+    <<: *defaults
+    machine:
+      image: android:202102-01
+    resource_class: large
+    environment:
+      <<: *android-env
+      <<: *bash-env
+    steps:
+      - android-e2e-test:
+          folder: "./e2e/tests/room/"
+
+  android-e2e-test-team:
+    <<: *defaults
+    machine:
+      image: android:202102-01
+    resource_class: large
+    environment:
+      <<: *android-env
+      <<: *bash-env
+    steps:
+      - android-e2e-test:
+          folder: "./e2e/tests/team/"
 
   android-internal-app-sharing-experimental:
     <<: *defaults