diff --git a/.github/workflows/test-pnpm-v11.yml b/.github/workflows/test-pnpm-v11.yml
new file mode 100644
index 000000000..9d6a7f9d2
--- /dev/null
+++ b/.github/workflows/test-pnpm-v11.yml
@@ -0,0 +1,38 @@
+name: Test pnpm v11 upgrade
+on:
+  push:
+    branches: [feat/upgrade-pnpm-v11]
+  pull_request:
+    branches: [main]
+    paths:
+      - '.github/workflows/test-pnpm-v11.yml'
+      - 'package.json'
+      - 'pnpm-lock.yaml'
+
+jobs:
+  test-pnpm-v11:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: app
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: pnpm/action-setup@v6
+        with:
+          version: latest-11
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 24
+          cache: pnpm
+          cache-dependency-path: app/pnpm-lock.yaml
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build
+        run: pnpm build
+
+      - name: Report pnpm version
+        run: pnpm --version
diff --git a/app/package.json b/app/package.json
index 9caffdbf4..0125f22be 100644
--- a/app/package.json
+++ b/app/package.json
@@ -34,7 +34,7 @@
     "http-status-codes": "^1.4.0",
     "launchdarkly-js-client-sdk": "^3.9.0",
     "lodash": "^4.17.21",
-    "pinia": "^2.0.35",
+    "pinia": "~2.0.35",
     "pinia-class": "^0.0.3",
     "qs": "^6.12.1",
     "quill": "^2.0.0",
@@ -87,5 +87,6 @@
     "onlyBuiltDependencies": [
       "vue-demi"
     ]
-  }
+  },
+  "packageManager": "pnpm@11.9.0"
 }
\ No newline at end of file