diff --git a/.github/workflows/canary-publish.yml b/.github/workflows/canary-publish.yml
index c6bdd12..b82bed2 100644
--- a/.github/workflows/canary-publish.yml
+++ b/.github/workflows/canary-publish.yml
@@ -24,9 +24,6 @@ jobs:
       - name: Install dependencies
         run: npm install -g pnpm && pnpm i
 
-      - name: Build
-        run: pnpm build
-
       - name: Set up Git identity
         run: |
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
@@ -37,6 +34,9 @@ jobs:
           SHORT_COMMIT_ID=$(git log -1 --pretty=format:%h)
           npm version prerelease --preid="canary-$SHORT_COMMIT_ID"
 
+      - name: Build
+        run: pnpm build
+
       - name: Canary release to npm
         run: |
           npm publish --access public --tag canary
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f16215a..3787bce 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,31 +20,17 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 10
 
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-
-      - name: Setup pnpm cache
-        uses: actions/cache@v4
+      - name: Setup Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
         with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+          node-version: ${{ matrix.node-version }}
+          cache: 'pnpm'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile