diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8e93262189..5a0b8af973 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -180,26 +180,25 @@ jobs:
           command: npx nx-cloud record yarn documentation
           no_output_timeout: 20m
       - run:
-          name: Run Lint/Test/Build
+          name: Run Lint/Test/Build/E2E
+          no_output_timeout: 45m
           command: |
             pids=()
 
-            npx nx-cloud record yarn nx workspace-lint &
+            (yarn nx affected --target=build --base=$NX_BASE --head=$NX_HEAD --parallel=3 && npx nx affected --target=e2e --base=$NX_BASE --head=$NX_HEAD --exclude=e2e-storybook,e2e-storybook-angular,e2e-react-native,e2e-detox,e2e-make-angular-cli-faster --parallel=1) &
             pids+=($!)
-            yarn nx affected --target=lint --base=$NX_BASE --head=$NX_HEAD --parallel=3 &
+            (npx nx-cloud record yarn nx workspace-lint && yarn nx affected --target=lint --base=$NX_BASE --head=$NX_HEAD --parallel=3) &
             pids+=($!)
             yarn nx affected --target=test --base=$NX_BASE --head=$NX_HEAD --parallel=1 &
             pids+=($!)
-            yarn nx affected --target=build --base=$NX_BASE --head=$NX_HEAD --parallel=3 &
-            pids+=($!)
             for pid in "${pids[@]}"; do
               wait "$pid"
             done
       - run:
-          name: Run E2E Tests
-          command: |
-            npx nx affected --target=e2e --base=$NX_BASE --head=$NX_HEAD --exclude=e2e-storybook,e2e-storybook-angular,e2e-react-native,e2e-detox,e2e-make-angular-cli-faster --parallel=1
-          no_output_timeout: 45m
+          name: Stop All Running Agents for This CI Run
+          command: npx nx-cloud stop-all-agents
+          when: always
+
   # -------------------------
   #     JOBS: Main-MacOS
   # -------------------------