diff --git a/.github/workflows/ios_detox.yml b/.github/workflows/ios_detox.yml
index 7259f794f..1c1d96b09 100644
--- a/.github/workflows/ios_detox.yml
+++ b/.github/workflows/ios_detox.yml
@@ -1,9 +1,9 @@
-name: iOS
+name: iOS Detox
 
-on: [push]
+on: [pull_request]
 
 jobs:
-  build:
+  detox-build:
     runs-on: macos-latest
     timeout-minutes: 60
 
@@ -16,6 +16,63 @@ jobs:
       with:
         fetch-depth: 1
 
+    - name: Generate Detox app cache key
+      run: echo $(git rev-parse HEAD:app) > "./app-git-revision.txt"
+
+    - name: Cache Detox app
+      uses: actions/cache@v1
+      id: detoxappcache
+      with:
+        path: ios/build/Build/Products/Release-iphonesimulator/RocketChatRN.app
+        key: iOSDetoxRelease-v3-${{ hashFiles('yarn.lock') }}-${{ hashFiles('ios/Podfile.lock') }}-${{ hashFiles('./app-git-revision.txt') }}
+
+    - name: Node
+      if: steps.detoxappcache.outputs.cache-hit == 'false'
+      uses: actions/setup-node@v1
+
+    - name: Cache node modules
+      if: steps.detoxappcache.outputs.cache-hit == 'false'
+      uses: actions/cache@v1
+      id: npmcache
+      with:
+        path: node_modules
+        key: node-modules-${{ hashFiles('**/yarn.lock') }}
+
+    - name: Rebuild detox
+      if: steps.detoxappcache.outputs.cache-hit == 'false' && steps.npmcache.outputs.cache-hit == 'true'
+      run: yarn detox clean-framework-cache && yarn detox build-framework-cache
+
+    - name: Install Dependencies
+      if: steps.detoxappcache.outputs.cache-hit == 'false' && steps.npmcache.outputs.cache-hit != 'true'
+      run: yarn install
+
+    - run: yarn detox build e2e --configuration ios.sim.release
+      if: steps.detoxappcache.outputs.cache-hit == 'false'
+
+  detox-test-rooms:
+    needs: detox-build
+    runs-on: macos-latest
+    timeout-minutes: 60
+
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_11.5.app
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+
+    - name: Generate Detox app cache key
+      run: echo $(git rev-parse HEAD:app) > "./app-git-revision.txt"
+
+    - name: Cache Detox app
+      uses: actions/cache@v1
+      id: detoxappcache
+      with:
+        path: ios/build/Build/Products/Release-iphonesimulator/RocketChatRN.app
+        key: iOSDetoxRelease-v3-${{ hashFiles('yarn.lock') }}-${{ hashFiles('ios/Podfile.lock') }}-${{ hashFiles('./app-git-revision.txt') }}
+
     - name: Node
       uses: actions/setup-node@v1
 
@@ -34,14 +91,98 @@ jobs:
       if: steps.npmcache.outputs.cache-hit != 'true'
       run: yarn install
 
-    - name: Cache Pods
-      uses: actions/cache@v1
-      id: podcache
+    - run: brew tap wix/brew
+    - run: brew install applesimutils
+    - run: yarn detox test e2e/tests/rooms --configuration ios.sim.release
+
+  detox-test-assorted:
+    needs: detox-build
+    runs-on: macos-latest
+    timeout-minutes: 60
+
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_11.5.app
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
       with:
-        path: ios/Pods
-        key: pods-${{ hashFiles('**/Podfile.lock') }}
+        fetch-depth: 1
+
+    - name: Generate Detox app cache key
+      run: echo $(git rev-parse HEAD:app) > "./app-git-revision.txt"
+
+    - name: Cache Detox app
+      uses: actions/cache@v1
+      id: detoxappcache
+      with:
+        path: ios/build/Build/Products/Release-iphonesimulator/RocketChatRN.app
+        key: iOSDetoxRelease-v3-${{ hashFiles('yarn.lock') }}-${{ hashFiles('ios/Podfile.lock') }}-${{ hashFiles('./app-git-revision.txt') }}
+
+    - name: Node
+      uses: actions/setup-node@v1
+
+    - name: Cache node modules
+      uses: actions/cache@v1
+      id: npmcache
+      with:
+        path: node_modules
+        key: node-modules-${{ hashFiles('**/yarn.lock') }}
+
+    - name: Rebuild detox
+      if: steps.npmcache.outputs.cache-hit == 'true'
+      run: yarn detox clean-framework-cache && yarn detox build-framework-cache
+
+    - name: Install Dependencies
+      if: steps.npmcache.outputs.cache-hit != 'true'
+      run: yarn install
 
     - run: brew tap wix/brew
     - run: brew install applesimutils
-    - run: yarn detox build e2e --configuration ios.sim.release
-    - run: yarn detox test e2e/tests --configuration ios.sim.release
\ No newline at end of file
+    - run: yarn detox test e2e/tests/assorted --configuration ios.sim.release
+
+  detox-test-onboarding:
+    needs: detox-build
+    runs-on: macos-latest
+    timeout-minutes: 60
+
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_11.5.app
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+
+    - name: Generate Detox app cache key
+      run: echo $(git rev-parse HEAD:app) > "./app-git-revision.txt"
+
+    - name: Cache Detox app
+      uses: actions/cache@v1
+      id: detoxappcache
+      with:
+        path: ios/build/Build/Products/Release-iphonesimulator/RocketChatRN.app
+        key: iOSDetoxRelease-v3-${{ hashFiles('yarn.lock') }}-${{ hashFiles('ios/Podfile.lock') }}-${{ hashFiles('./app-git-revision.txt') }}
+
+    - name: Node
+      uses: actions/setup-node@v1
+
+    - name: Cache node modules
+      uses: actions/cache@v1
+      id: npmcache
+      with:
+        path: node_modules
+        key: node-modules-${{ hashFiles('**/yarn.lock') }}
+
+    - name: Rebuild detox
+      if: steps.npmcache.outputs.cache-hit == 'true'
+      run: yarn detox clean-framework-cache && yarn detox build-framework-cache
+
+    - name: Install Dependencies
+      if: steps.npmcache.outputs.cache-hit != 'true'
+      run: yarn install
+
+    - run: brew tap wix/brew
+    - run: brew install applesimutils
+    - run: yarn detox test e2e/tests/onboarding --configuration ios.sim.release