diff --git a/.circleci/config.yml b/.circleci/config.yml
index b80c58fe1c..aa82fb8d84 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -93,7 +93,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="./.nx/workflows/dynamic-changesets.yaml" --stop-agents-after="e2e"
       - run:
           command: |
             sudo apt-get update
diff --git a/.nx/workflows/agents.yaml b/.nx/workflows/agents.yaml
index 21259c44f4..4b136c16b6 100644
--- a/.nx/workflows/agents.yaml
+++ b/.nx/workflows/agents.yaml
@@ -56,3 +56,60 @@ launch-templates:
 
       - name: Install zip and unzip
         script: sudo apt-get -yqq install zip unzip
+  linux-large:
+    resource-class: 'docker_linux_amd64/large'
+    image: 'ubuntu22.04-node20.11-v10'
+    env:
+      GIT_AUTHOR_EMAIL: test@test.com
+      GIT_AUTHOR_NAME: Test
+      GIT_COMMITTER_EMAIL: test@test.com
+      GIT_COMMITTER_NAME: Test
+      SELECTED_PM: 'pnpm'
+      NPM_CONFIG_PREFIX: '/home/workflows/.npm-global'
+      NX_NATIVE_LOGGING: 'nx::native::db'
+    init-steps:
+      - name: Checkout
+        uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/checkout/main.yaml'
+      - name: Cache restore
+        uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/cache/main.yaml'
+        inputs:
+          key: 'pnpm-lock.yaml'
+          paths: |
+            node_modules
+            ~/.cache/Cypress
+            ~/.cache/ms-playwright
+            ~/.pnpm-store
+          base_branch: 'master'
+      - name: Install e2e deps
+        script: |
+          sudo apt-get update
+          sudo apt-get install -y ca-certificates lsof libvips-dev libglib2.0-dev libgirepository1.0-dev
+      - name: Install Pnpm
+        script: |
+          npm install -g pnpm@9.8.0
+
+      - name: Pnpm Install
+        script: |
+          pnpm install --frozen-lockfile
+
+      - name: Install Browsers
+        script: |
+          pnpm exec cypress install
+          pnpm exec playwright install
+
+      - 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: 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
+
+      - name: Install zip and unzip
+        script: sudo apt-get -yqq install zip unzip
diff --git a/.nx/workflows/dynamic-changesets.yaml b/.nx/workflows/dynamic-changesets.yaml
index 0fc5d998c6..e7b212909d 100644
--- a/.nx/workflows/dynamic-changesets.yaml
+++ b/.nx/workflows/dynamic-changesets.yaml
@@ -1,4 +1,10 @@
 distribute-on:
-  small-changeset: 8 linux-medium
-  medium-changeset: 10 linux-medium
-  large-changeset: 12 linux-medium
+  default: auto linux-medium, 1 linux-large
+assignment-rules:
+  - project: nx-dev
+    target: build-base
+    runs-on:
+      - linux-large
+  - target: test
+    runs-on:
+      - linux-medium
diff --git a/nx-dev/nx-dev/project.json b/nx-dev/nx-dev/project.json
index bb41bbf2e5..437abd191e 100644
--- a/nx-dev/nx-dev/project.json
+++ b/nx-dev/nx-dev/project.json
@@ -41,6 +41,7 @@
       }
     },
     "build-base": {
+      "parallelism": false,
       "executor": "@nx/next:build",
       "dependsOn": ["copy-docs"],
       "outputs": ["{options.outputPath}"],
diff --git a/nx.json b/nx.json
index 199a349e50..c03617a27d 100644
--- a/nx.json
+++ b/nx.json
@@ -246,7 +246,7 @@
   "nxCloudUrl": "https://staging.nx.app",
   "parallel": 1,
   "cacheDirectory": "/tmp/nx-cache",
-  "bust": 8,
+  "bust": 1,
   "defaultBase": "master",
   "generators": {
     "@nx/react": {