diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe37b74044..eb495fed7e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,7 +92,7 @@ jobs:
       - checkout
       - nx/set-shas:
           main-branch-name: 'master'
-      - run: npx nx-cloud@next start-ci-run --distribute-on="auto linux-medium" --stop-agents-after="e2e"
+      - run: npx nx-cloud@next start-ci-run --distribute-on="auto linux-medium" --stop-agents-after="e2e" --require-explicit-completion
       - run:
           command: |
             sudo apt-get update
@@ -122,6 +122,10 @@ jobs:
             for pid in "${pids[@]}"; do
               wait "$pid"
             done
+      - run:
+          name: End CI Run
+          command: npx nx-cloud@next complete-ci-run
+          no_output_timeout: 20m
   # -------------------------
   #     JOBS: Main-MacOS
   # -------------------------