diff --git a/.nx/workflows/dynamic-changesets.yaml b/.nx/workflows/dynamic-changesets.yaml
index 786111053d..39d858d5b2 100644
--- a/.nx/workflows/dynamic-changesets.yaml
+++ b/.nx/workflows/dynamic-changesets.yaml
@@ -1,4 +1,4 @@
 distribute-on:
   small-changeset: 4 linux-medium-js
   medium-changeset: 8 linux-medium-js
-  large-changeset: 14 linux-medium-js
+  large-changeset: 16 linux-medium-js
diff --git a/.nx/workflows/sandboxing-config.yaml b/.nx/workflows/sandboxing-config.yaml
new file mode 100644
index 0000000000..14dffe4665
--- /dev/null
+++ b/.nx/workflows/sandboxing-config.yaml
@@ -0,0 +1,4 @@
+task-exclusions:
+  - target: test:build
+    exclude-reads:
+      - LICENSE
diff --git a/nx.json b/nx.json
index 08e7563642..fa8faac2e9 100644
--- a/nx.json
+++ b/nx.json
@@ -1,5 +1,6 @@
 {
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
+  "bust": "baseline-16-july-more-runners",
   "defaultBase": "main",
   "nxCloudId": "6442f7de8226a6291646a813",
   "useInferencePlugins": false,
@@ -9,10 +10,18 @@
   },
   "namedInputs": {
     "sharedGlobals": [
+      "{workspaceRoot}/.npmrc",
+      "{workspaceRoot}/.nx/workflows/sandboxing-config.yaml",
       "{workspaceRoot}/.nvmrc",
       "{workspaceRoot}/package.json",
       "{workspaceRoot}/tsconfig.json"
     ],
+    "dependentTaskOutputs": [
+      {
+        "dependentTasksOutputFiles": "**/*",
+        "transitive": true
+      }
+    ],
     "default": [
       "sharedGlobals",
       "{projectRoot}/**/*",
@@ -32,18 +41,28 @@
     "test:eslint": {
       "cache": true,
       "dependsOn": ["^build"],
-      "inputs": ["default", "^production", "{workspaceRoot}/eslint.config.js"]
+      "inputs": [
+        "default",
+        "^production",
+        "{workspaceRoot}/eslint.config.js",
+        "dependentTaskOutputs"
+      ]
     },
     "test:unit": {
       "cache": true,
       "dependsOn": ["^build"],
-      "inputs": ["default", "^production"],
+      "inputs": ["default", "^production", "dependentTaskOutputs"],
       "outputs": ["{projectRoot}/coverage"]
     },
     "test:e2e": {
       "cache": true,
       "dependsOn": ["^build", "test:e2e--*"],
-      "inputs": ["default", "^production"]
+      "inputs": ["default", "^production", "dependentTaskOutputs"],
+      "outputs": [
+        "{projectRoot}/dist",
+        "{projectRoot}/port-*.txt",
+        "{projectRoot}/test-results"
+      ]
     },
     "test:e2e:nitro": {
       "cache": true,
@@ -63,23 +82,28 @@
     "test:types": {
       "cache": true,
       "dependsOn": ["^build"],
-      "inputs": ["default", "^production"]
+      "inputs": ["default", "^production", "dependentTaskOutputs"]
     },
     "test:types:ssr": {
       "cache": true,
       "dependsOn": ["^build"],
-      "inputs": ["default", "^production"]
+      "inputs": [
+        "default",
+        "^production",
+        "{workspaceRoot}/benchmarks/ssr/bench-utils.ts",
+        "dependentTaskOutputs"
+      ]
     },
     "build": {
       "cache": true,
       "dependsOn": ["^build"],
-      "inputs": ["production", "^production"],
+      "inputs": ["production", "^production", "dependentTaskOutputs"],
       "outputs": ["{projectRoot}/build", "{projectRoot}/dist"]
     },
     "test:build": {
       "cache": true,
       "dependsOn": ["build"],
-      "inputs": ["production"]
+      "inputs": ["production", "dependentTaskOutputs"]
     }
   },
   "plugins": [