diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml
index 2b8e28e..8cf0b82 100644
--- a/.github/workflows/npmpublish.yml
+++ b/.github/workflows/npmpublish.yml
@@ -34,7 +34,10 @@ jobs:
       - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:
-          version: 10
+          # No `version:` here — defer to packageManager in package.json so
+          # we don't get the "Multiple versions of pnpm specified" error
+          # when an upstream checkout (etherpad-lite) pins a different
+          # pnpm via packageManager. See pnpm/action-setup#225.
           run_install: false
       - name: Get pnpm store directory
         shell: bash
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
index d0ec5d8..7852057 100644
--- a/.github/workflows/test-and-release.yml
+++ b/.github/workflows/test-and-release.yml
@@ -15,7 +15,7 @@ jobs:
           node-version: 20
       - uses: pnpm/action-setup@v6
         with:
-          version: 10
+          # No `version:` — defer to packageManager in package.json.
           run_install: false
       - name: Get pnpm store directory
         shell: bash
diff --git a/package.json b/package.json
index 60e5af6..d19cd89 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "type": "individual",
     "url": "https://etherpad.org/"
   },
+  "packageManager": "pnpm@11.0.6",
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",