diff --git a/package.json b/package.json
index a8861e5c..5ac50bd2 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "type": "git",
     "url": "git+https://github.com/TanStack/cli.git"
   },
-  "packageManager": "pnpm@10.24.0",
+  "packageManager": "pnpm@11.1.0",
   "type": "module",
   "scripts": {
     "cleanNodeModules": "rm -rf node_modules && pnpm -r exec rm -rf node_modules",
@@ -37,16 +37,5 @@
     "nx": "22.1.3",
     "semver": "^7.6.3",
     "typescript": "^6.0.2"
-  },
-  "pnpm": {
-    "overrides": {
-      "@tanstack/create-start": "workspace:*",
-      "create-start-app": "workspace:*",
-      "create-tanstack": "workspace:*",
-      "create-tanstack-app": "workspace:*",
-      "create-tsrouter-app": "workspace:*",
-      "@tanstack/cli": "workspace:*",
-      "@tanstack/create": "workspace:*"
-    }
   }
 }
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index e789f299..1b0d14df 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -6,3 +6,18 @@ packages:
   - 'cli-aliases/*'
   - 'packages/*'
   - 'examples/custom-cli/*'
+
+overrides:
+  '@tanstack/create-start': 'workspace:*'
+  'create-start-app': 'workspace:*'
+  'create-tanstack': 'workspace:*'
+  'create-tanstack-app': 'workspace:*'
+  'create-tsrouter-app': 'workspace:*'
+  '@tanstack/cli': 'workspace:*'
+  '@tanstack/create': 'workspace:*'
+
+allowBuilds:
+  # root dependencies
+  esbuild: true
+  nx: true
+  unrs-resolver: false # not directly required for build