diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 4306237c8..a00aaa995 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -25,7 +25,7 @@ runs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
       with:
-        version: 9
+        version: 10.30.3
 
     - name: Set up Node.js
       uses: actions/setup-node@v6
diff --git a/functions/package.json b/functions/package.json
index 790201c9b..71afb9256 100644
--- a/functions/package.json
+++ b/functions/package.json
@@ -98,7 +98,8 @@
     "sanitize-html": "catalog:"
   },
   "engines": {
-    "node": "22"
+    "node": "22",
+    "pnpm": "10.30.3"
   },
   "private": true,
   "devDependencies": {
diff --git a/package.json b/package.json
index d6e80f48f..d57938afd 100644
--- a/package.json
+++ b/package.json
@@ -149,25 +149,6 @@
   "engines": {
     "node": "22"
   },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "@bufbuild/buf",
-      "@firebase/util",
-      "@parcel/watcher",
-      "core-js",
-      "esbuild",
-      "farmhash",
-      "fsevents",
-      "less",
-      "lmdb",
-      "msgpackr-extract",
-      "nx",
-      "protobufjs",
-      "puppeteer",
-      "re2",
-      "unrs-resolver"
-    ]
-  },
   "optionalDependencies": {
     "@nx/nx-linux-x64-gnu": "^19.3.2"
   }
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 7e58aeab6..7da471bb9 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -5,6 +5,23 @@ packages:
   - proto
   - web
 
+onlyBuiltDependencies:
+  - '@bufbuild/buf'
+  - '@firebase/util'
+  - '@parcel/watcher'
+  - core-js
+  - esbuild
+  - farmhash
+  - fsevents
+  - less
+  - lmdb
+  - msgpackr-extract
+  - nx
+  - protobufjs
+  - puppeteer
+  - re2
+  - unrs-resolver
+
 catalogs:
   default:
     '@angular/animations': ^20.3.15