diff --git a/.nx/workflows/dynamic-changesets.yaml b/.nx/workflows/dynamic-changesets.yaml
index d3536f3ba7b..e1bb1792fda 100644
--- a/.nx/workflows/dynamic-changesets.yaml
+++ b/.nx/workflows/dynamic-changesets.yaml
@@ -2,3 +2,16 @@ distribute-on:
   small-changeset: 3 linux-medium-js
   medium-changeset: 6 linux-medium-js
   large-changeset: 10 linux-medium-js
+
+assignment-rules:
+  - targets:
+      - build
+    run-on:
+      - agent: linux-medium-js
+        parallelism: 5
+
+  - targets:
+      - lint
+    run-on:
+      - agent: linux-medium-js
+        parallelism: 4
\ No newline at end of file
diff --git a/e2e/react-start/basic/package.json b/e2e/react-start/basic/package.json
index 5200e344027..0f6070871a3 100644
--- a/e2e/react-start/basic/package.json
+++ b/e2e/react-start/basic/package.json
@@ -18,7 +18,7 @@
     "test:e2e:ssrMode": "rm -rf port*.txt; playwright test --project=chromium",
     "test:e2e:prerender": "rm -rf port*.txt; MODE=prerender playwright test --project=chromium",
     "test:e2e:preview": "rm -rf port*.txt; MODE=preview playwright test --project=chromium",
-    "test:e2e": "pnpm run test:e2e:spaMode && pnpm run test:e2e:ssrMode && pnpm run test:e2e:prerender && pnpm run test:e2e:preview"
+    "test:e2e": "node -e \"console.log('Should be run with Nx')\""
   },
   "dependencies": {
     "@tanstack/react-router": "workspace:^",
diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json
index 2e278ac438a..ca26752076a 100644
--- a/e2e/solid-start/basic/package.json
+++ b/e2e/solid-start/basic/package.json
@@ -18,7 +18,7 @@
     "test:e2e:ssrMode": "rm -rf port*.txt; playwright test --project=chromium",
     "test:e2e:prerender": "rm -rf port*.txt; MODE=prerender playwright test --project=chromium",
     "test:e2e:preview": "rm -rf port*.txt; MODE=preview playwright test --project=chromium",
-    "test:e2e": "pnpm run test:e2e:spaMode && pnpm run test:e2e:ssrMode && pnpm run test:e2e:prerender && pnpm run test:e2e:preview"
+    "test:e2e": "node -e \"console.log('Should be run with Nx')\""
   },
   "dependencies": {
     "@tanstack/solid-router": "workspace:^",
diff --git a/e2e/vue-start/basic/package.json b/e2e/vue-start/basic/package.json
index 712d6f60042..d136193aadd 100644
--- a/e2e/vue-start/basic/package.json
+++ b/e2e/vue-start/basic/package.json
@@ -18,7 +18,7 @@
     "test:e2e:ssrMode": "rm -rf port*.txt; playwright test --project=chromium",
     "test:e2e:prerender": "rm -rf port*.txt; MODE=prerender playwright test --project=chromium",
     "test:e2e:preview": "rm -rf port*.txt; MODE=preview playwright test --project=chromium",
-    "test:e2e": "pnpm run test:e2e:spaMode && pnpm run test:e2e:ssrMode && pnpm run test:e2e:prerender && pnpm run test:e2e:preview"
+    "test:e2e": "node -e \"console.log('Should be run with Nx')\""
   },
   "dependencies": {
     "@tanstack/vue-router": "workspace:^",
diff --git a/nx.json b/nx.json
index 4f8c811d34d..a485faf609b 100644
--- a/nx.json
+++ b/nx.json
@@ -4,6 +4,7 @@
   "nxCloudId": "6442f7de8226a6291646a813",
   "useInferencePlugins": false,
   "parallel": 5,
+  "bust": 1,
   "tui": {
     "enabled": false
   },
@@ -41,6 +42,32 @@
       "outputs": ["{projectRoot}/coverage"]
     },
     "test:e2e": {
+      "cache": true,
+      "dependsOn": [
+        "^build",
+        "test:e2e:spaMode",
+        "test:e2e:ssrMode",
+        "test:e2e:prerender",
+        "test:e2e:preview"
+      ],
+      "inputs": ["default", "^production"]
+    },
+    "test:e2e:spaMode": {
+      "cache": true,
+      "dependsOn": ["^build", "test:e2e:ssrMode"],
+      "inputs": ["default", "^production"]
+    },
+    "test:e2e:ssrMode": {
+      "cache": true,
+      "dependsOn": ["^build", "test:e2e:prerender"],
+      "inputs": ["default", "^production"]
+    },
+    "test:e2e:prerender": {
+      "cache": true,
+      "dependsOn": ["^build", "test:e2e:preview"],
+      "inputs": ["default", "^production"]
+    },
+    "test:e2e:preview": {
       "cache": true,
       "dependsOn": ["^build"],
       "inputs": ["default", "^production"]