diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 4c83337bd..a7afbaab1 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -21,9 +21,9 @@ jobs:
           persist-credentials: false
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
+        uses: pnpm/action-setup@739bfe42ca9233c5e6aca07c1a25a9d34aca49b0 # v6.0.7
         with:
-          version: 10.27.0
+          cache: false
 
       - name: Setup Node.js
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
diff --git a/package.json b/package.json
index 688ba22d6..93eae3610 100644
--- a/package.json
+++ b/package.json
@@ -5,30 +5,8 @@
     "type": "git",
     "url": "git+https://github.com/TanStack/db.git"
   },
-  "packageManager": "pnpm@10.27.0",
+  "packageManager": "pnpm@11.1.0",
   "type": "module",
-  "pnpm": {
-    "overrides": {
-      "metro": "0.82.5",
-      "metro-babel-transformer": "0.82.5",
-      "metro-cache": "0.82.5",
-      "metro-cache-key": "0.82.5",
-      "metro-config": "0.82.5",
-      "metro-core": "0.82.5",
-      "metro-file-map": "0.82.5",
-      "metro-minify-terser": "0.82.5",
-      "metro-resolver": "0.82.5",
-      "metro-runtime": "0.82.5",
-      "metro-source-map": "0.82.5",
-      "metro-symbolicate": "0.82.5",
-      "metro-transform-plugins": "0.82.5",
-      "metro-transform-worker": "0.82.5"
-    },
-    "onlyBuiltDependencies": [
-      "better-sqlite3",
-      "electron"
-    ]
-  },
   "scripts": {
     "build": "pnpm --filter \"./packages/**\" build",
     "build:minified": "pnpm --filter \"./packages/**\" build:minified",
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 18dafa94f..2d492f7f5 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,7 +1,41 @@
 cleanupUnusedCatalogs: true
 linkWorkspacePackages: true
 preferWorkspacePackages: true
+blockExoticSubdeps: false
 
 packages:
   - packages/**
   - examples/**/*
+
+overrides:
+  metro: '0.82.5'
+  metro-babel-transformer: '0.82.5'
+  metro-cache: '0.82.5'
+  metro-cache-key: '0.82.5'
+  metro-config: '0.82.5'
+  metro-core: '0.82.5'
+  metro-file-map: '0.82.5'
+  metro-minify-terser: '0.82.5'
+  metro-resolver: '0.82.5'
+  metro-runtime: '0.82.5'
+  metro-source-map: '0.82.5'
+  metro-symbolicate: '0.82.5'
+  metro-transform-plugins: '0.82.5'
+  metro-transform-worker: '0.82.5'
+
+allowBuilds:
+  better-sqlite3: true
+  electron: true
+
+  '@firebase/util': false
+  '@journeyapps/wa-sqlite': false
+  '@parcel/watcher': false
+
+  esbuild: false
+  lmdb: false
+  msgpackr-extract: false
+  protobufjs: false
+  rxdb: false
+  sharp: false
+  unrs-resolver: false
+  workerd: false