diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8d9e45c..08faea6 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,15 +22,21 @@ jobs:
           fetch-depth: 0 # Important for changelog
           filter: blob:none # We don't need all blobs
 
-      - run: corepack enable
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
+        with:
+          standalone: true
+
       - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version-file: .node-version
           registry-url: https://registry.npmjs.org/
+          cache: 'pnpm'
+
       - run: pnpm install
 
       - run: echo VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_ENV
       - run: pnpm version ${VERSION}
+
       - name: Generate changelog with git-cliff
         uses: tj-actions/git-cliff@75599f745633e29f99bd9e14a30865b7d2fcbe84 # v1.5.0
         with:
@@ -40,6 +46,7 @@ jobs:
       - run: pnpm publish --access public
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+
       - uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # v1.14.0
         with:
           bodyFile: 'CHANGELOG.md'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9df32d7..2650eb0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,11 +22,14 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - run: corepack enable
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
+        with:
+          standalone: true
 
       - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version-file: .node-version
+          cache: 'pnpm'
 
       - run: pnpm install