diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9016069b..d5d840bc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,12 +78,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Enable corepack and pnpm
-        run: |
-          corepack enable
-          corepack prepare pnpm@9 --activate
-          pnpm -v
-          node -v
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 9
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'pnpm'
 
       - name: Install
         run: pnpm install
@@ -102,4 +106,3 @@ jobs:
 
       - name: Test ${{ matrix.package }}
         run: cd ./packages/${{ matrix.package }} && pnpm test
-
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 59dbe3e6..97fed8a3 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -52,12 +52,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Enable corepack and pnpm
-        run: |
-          corepack enable
-          corepack prepare pnpm@9 --activate
-          pnpm -v
-          node -v
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 9
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'pnpm'
 
       - name: Install
         run: pnpm install
@@ -74,4 +78,3 @@ jobs:
 
       - name: Run Integration Tests
         run: ./scripts/test-all-packages.js
-
diff --git a/Dockerfile b/Dockerfile
index 9448e680..2c9c12f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,7 @@ RUN set -eux; \
     apt-get update; \
     apt-get install -y --no-install-recommends ca-certificates curl git; \
     update-ca-certificates || true; \
-    corepack enable; \
-    corepack prepare pnpm@10.12.2 --activate; \
+    npm install -g pnpm@10.12.2; \
     rm -rf /var/lib/apt/lists/*
 
 # Copy workspace (build context is the repo root of pgpm-modules)
diff --git a/package.json b/package.json
index 86768494..2ec1f71c 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
   "publishConfig": {
     "access": "restricted"
   },
-  "packageManager": "pnpm@10.12.2",
   "workspaces": [
     "packages/*"
   ],