diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd3cd69d3..d2054d6ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,8 @@
 # See:
 # https://docs.github.com/en/actions/guides/building-and-testing-nodejs#building-and-testing-your-code
 # https://pnpm.io/ja/continuous-integration#github-actions
+# https://github.com/pnpm/action-setup/issues/99#issuecomment-1918361558
+# https://github.com/actions/setup-node#inputs
 # https://vercel.com/guides/how-can-i-use-github-actions-with-vercel
 # https://zenn.dev/ttskch/articles/691fb62fbb6b1b
 # https://vercel.com/guides/set-up-a-staging-environment-on-vercel
@@ -8,7 +10,6 @@
 # https://vercel.com/docs/cli/global-options#scope
 # https://www.prisma.io/docs/orm/prisma-client/deployment/deploy-database-changes-with-prisma-migrate
 # https://www.prisma.io/docs/orm/prisma-migrate/workflows/baselining
-# https://github.com/pnpm/action-setup/issues/99#issuecomment-1918361558
 name: CI
 
 env:
@@ -28,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.x]
+        node-version: [22]
 
     steps:
       - name: Check out Git repository
@@ -36,12 +37,18 @@ jobs:
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
+        with:
+          # Auto-detect pnpm version from package.json (requires packageManager in package.json)
+          package_json_file: package.json
+          run_install: false
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
+          check-latest: true
           cache: 'pnpm'
+          cache-dependency-path: pnpm-lock.yaml
 
       - name: Install dependencies
         run: pnpm install
@@ -76,6 +83,10 @@ jobs:
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
+        with:
+          # Auto-detect pnpm version from package.json (requires packageManager in package.json)
+          package_json_file: package.json
+          run_install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -83,6 +94,7 @@ jobs:
           node-version: 22
           check-latest: true
           cache: 'pnpm'
+          cache-dependency-path: pnpm-lock.yaml
 
       - name: Install dependencies
         run: pnpm install
@@ -123,6 +135,10 @@ jobs:
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
+        with:
+          # Auto-detect pnpm version from package.json (requires packageManager in package.json)
+          package_json_file: package.json
+          run_install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -130,6 +146,7 @@ jobs:
           node-version: 22
           check-latest: true
           cache: 'pnpm'
+          cache-dependency-path: pnpm-lock.yaml
 
       - name: Install dependencies
         run: pnpm install