diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6e13652da0a18c..2fd32e576cad2c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -215,6 +215,19 @@ jobs:
   #     JOBS: Agent cleanup
   # -------------------------
   agent-cleanup:
+    parameters:
+      os:
+        type: string
+        default: 'linux'
+      cli:
+        type: string
+        default: ''
+      pm:
+        type: string
+        default: pnpm
+    executor: << parameters.os >>
+    environment:
+      NX_E2E_CI_CACHE_KEY: e2e-circleci-<< parameters.os >>-<< parameters.pm >>
     steps:
       - run:
           name: Stop All Running Agents for This CI Run
@@ -300,21 +313,20 @@ workflows:
           name: 'agent9'
       - agent:
           name: 'agent10'
+          os: 'macos'
+      # -------------------------
+      #     Pull request logic
+      # -------------------------
       - main:
-          name: 'Pull request'
+          name: pull-request
           run-checks: true
           filters:
             branches:
               ignore: master
       - main:
-          name: 'Commit to master'
-          run-cypress-tests: true
-          filters:
-            branches:
-              only: master
-      - main:
-          name: 'Partial Test'
+          name: pull-request-osx
           pm: 'yarn'
+          os: 'macos'
           run-checks: false
           run-builds: false
           run-unit-tests: false
@@ -323,7 +335,25 @@ workflows:
           filters:
             branches:
               ignore: master
-
       - agent-cleanup:
           requires:
-            - main
+            - pull-request
+            - pull-request-osx
+          filters:
+            branches:
+              ignore: master
+      # -------------------------
+      #     Commit to master
+      # -------------------------
+      - main:
+          name: commit-to-master
+          run-cypress-tests: true
+          filters:
+            branches:
+              only: master
+      - agent-cleanup:
+          requires:
+            - commit-to-master
+          filters:
+            branches:
+              only: master