diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
index ee8eea8c64..2e8393c33f 100644
--- a/.github/actions/setup-env/action.yml
+++ b/.github/actions/setup-env/action.yml
@@ -15,7 +15,7 @@ runs:
       with:
         node-version-file: ${{ inputs.path }}/.node-version
 
-    - uses: pnpm/action-setup@v4
+    - uses: pnpm/action-setup@v6
       with:
         run_install: false
         package_json_file: ${{ inputs.path }}/package.json
diff --git a/.mise.toml b/.mise.toml
index f24ff44c54..297c8e74c1 100644
--- a/.mise.toml
+++ b/.mise.toml
@@ -1,5 +1,6 @@
 [tools]
 node = "24.15.0"
+pnpm = "11.5.1"
 
 [hooks]
 enter = "mise install"
diff --git a/.tool-versions b/.tool-versions
index 67a67317db..b43815b79d 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1,2 @@
 nodejs 24.15.0
+pnpm 11.5.1
diff --git a/package.json b/package.json
index 1bbcab2e00..7e5a6a10ae 100644
--- a/package.json
+++ b/package.json
@@ -31,5 +31,5 @@
   "dependencies": {
     "@types/node": "^20.19.39"
   },
-  "packageManager": "pnpm@10.15.0"
+  "packageManager": "pnpm@11.5.1"
 }