diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3690004..e706a5f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,6 @@ jobs:
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 9
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -40,8 +38,6 @@ jobs:
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 9
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -65,8 +61,6 @@ jobs:
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 9
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -113,8 +107,6 @@ jobs:
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 9
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
diff --git a/.nvmrc b/.nvmrc
index 209e3ef..2bd5a0a 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20
+22
diff --git a/Dockerfile b/Dockerfile
index be929db..820b526 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,13 +7,16 @@
 # Run them as a separate release/pre-deploy step, e.g. `pnpm db:migrate`
 # (see README "Deployment").
 
-FROM node:20-alpine AS base
-RUN npm install -g pnpm@9
+FROM node:22-alpine AS base
+# Use the pnpm version pinned in package.json's "packageManager" field via corepack.
+RUN corepack enable
 
 # --- Dependencies ---
 FROM base AS deps
 WORKDIR /app
-COPY package.json pnpm-lock.yaml ./
+# pnpm-workspace.yaml carries the build-script allowlist (allowBuilds) and
+# overrides, so it must be present for the install to behave like local/CI.
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 RUN pnpm install --frozen-lockfile
 
 # --- Build ---
diff --git a/README.md b/README.md
index 1ca07d3..87322b5 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ Claude will run the skill end-to-end and ask you the few decisions it actually n
 
 ## Prerequisites
 
-- Node.js 20 or newer
+- Node.js 22 or newer (the pinned `pnpm` requires Node 22.13+)
 - Git
 - Docker **or** Podman (for the included PostgreSQL service and for building the deployment image). For `podman compose`, also install a compose provider (`docker-compose` or `podman-compose`).
 - A package manager: `pnpm`, `npm`, or `yarn`
diff --git a/package.json b/package.json
index 7ba216f..5e4cfb2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "agentic-coding-starter-kit",
   "version": "1.1.2",
+  "packageManager": "pnpm@11.6.0",
   "scripts": {
     "dev": "next dev --turbopack",
     "build": "next build",