diff --git a/.circleci/config.yml b/.circleci/config.yml
index 02a411c143..053bfec73e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -88,7 +88,7 @@ jobs:
       NX_CI_EXECUTION_ENV: 'linux'
     steps:
       - checkout
-      - run: npx nx-cloud@next start-ci-run --stop-agents-after="e2e"
+      - run: npx nx-cloud@next start-ci-run --distributes-on="8 linux-medium" --stop-agents-after="e2e"
       - run:
           command: |
             sudo apt-get update
diff --git a/.nx/workflows/agents.yaml b/.nx/workflows/agents.yaml
index 7a5cfe9ca1..78088ee461 100644
--- a/.nx/workflows/agents.yaml
+++ b/.nx/workflows/agents.yaml
@@ -1,59 +1,55 @@
-parallelism: 8
-env:
-  CI: 'true'
-  GIT_AUTHOR_EMAIL: test@test.com
-  GIT_AUTHOR_NAME: Test
-  GIT_COMMITTER_EMAIL: test@test.com
-  GIT_COMMITTER_NAME: Test
-  NX_E2E_CI_CACHE_KEY: e2e-circleci-linux
-  NX_VERBOSE_LOGGING: 'false'
-  NX_DAEMON: 'true'
-  NX_PERF_LOGGING: 'false'
-  NX_NATIVE_LOGGING: 'false'
-  SELECTED_PM: 'pnpm'
-  NX_E2E_RUN_E2E: 'true'
-  NPM_CONFIG_PREFIX: '/home/workflows/.npm-global'
-  NX_CLOUD_ACCESS_TOKEN: '{{secrets.NX_CLOUD_ACCESS_TOKEN}}'
-on:
-  - events:
-      - CREATE_RUN_GROUP
-steps:
-  - name: Checkout
-    uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/checkout/main.yaml'
-
-  - name: Cache restore
-    uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/cache/main.yaml'
+launch-templates:
+  linux-medium:
     env:
-      KEY: 'pnpm-lock.yaml'
-      PATHS: |
-        node_modules
-        ~/.cache/Cypress
-        ~/.pnpm-store
-      BASE_BRANCH: 'master'
+      CI: 'true'
+      GIT_AUTHOR_EMAIL: test@test.com
+      GIT_AUTHOR_NAME: Test
+      GIT_COMMITTER_EMAIL: test@test.com
+      GIT_COMMITTER_NAME: Test
+      NX_E2E_CI_CACHE_KEY: e2e-circleci-linux
+      NX_VERBOSE_LOGGING: 'false'
+      NX_DAEMON: 'true'
+      NX_PERF_LOGGING: 'false'
+      NX_NATIVE_LOGGING: 'false'
+      SELECTED_PM: 'pnpm'
+      NX_E2E_RUN_E2E: 'true'
+      NPM_CONFIG_PREFIX: '/home/workflows/.npm-global'
+      NX_CLOUD_ACCESS_TOKEN: '{{secrets.NX_CLOUD_ACCESS_TOKEN}}'
+    init-steps:
+      - name: Checkout
+        uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/checkout/main.yaml'
 
-  - name: Install Pnpm
-    script: |
-      npm install -g @pnpm/exe@8.7.4
+      - name: Cache restore
+        uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/cache/main.yaml'
+        env:
+          KEY: 'pnpm-lock.yaml'
+          PATHS: |
+            node_modules
+            ~/.cache/Cypress
+            ~/.pnpm-store
+          BASE_BRANCH: 'master'
 
-  - name: Pnpm Install
-    script: |
-      pnpm install --frozen-lockfile
+      - name: Install Pnpm
+        script: |
+          npm install -g @pnpm/exe@8.7.4
 
-  - name: Install Cypress
-    script: pnpm exec cypress install
+      - name: Pnpm Install
+        script: |
+          pnpm install --frozen-lockfile
 
-  - name: Install Rust
-    script: |
-      curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y
-      source "$HOME/.cargo/env"
-      rustup toolchain install 1.70.0
+      - name: Install Cypress
+        script: pnpm exec cypress install
 
-  - name: Configure git metadata (needed for lerna smoke tests)
-    script: |
-      git config --global user.email test@test.com
-      git config --global user.name "Test Test"
+      - name: Install Rust
+        script: |
+          curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y
+          source "$HOME/.cargo/env"
+          rustup toolchain install 1.70.0
 
-  - name: Run Agent
-    script: |
-      source "$HOME/.cargo/env"
-      npx nx-cloud start-agent
+      - name: Configure git metadata (needed for lerna smoke tests)
+        script: |
+          git config --global user.email test@test.com
+          git config --global user.name "Test Test"
+
+      - name: Load Cargo Env
+        script: echo "PATH=$HOME/.cargo/bin:$PATH" >> $NX_CLOUD_ENV