diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 011bd3f..756f053 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,14 +24,12 @@ jobs:
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: 24.16.0
+          package-manager-cache: false
 
-      - name: Setup Pnpm
-        run: |
-          npm install -g corepack@latest --force
-          corepack enable
-
-      - name: Install Dependencies
-        run: pnpm i
+      - name: Install Pnpm
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        with:
+          run_install: true
 
       - name: Build Packages
         run: pnpm build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 515617d..3fdc748 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,17 +23,16 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Install Pnpm
-        run: npm i -g corepack@latest --force && corepack enable
-
       - name: Setup Node.js
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: 24.16.0
-          cache: "pnpm"
+          package-manager-cache: false
 
-      - name: Install Dependencies
-        run: pnpm install
+      - name: Install Pnpm
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        with:
+          run_install: true
 
       - name: Build
         run: pnpm build
@@ -57,17 +56,16 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Install Pnpm
-        run: npm i -g corepack@latest --force && corepack enable
-
       - name: Setup Node.js
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: 24.16.0
-          cache: "pnpm"
+          package-manager-cache: false
 
-      - name: Install Dependencies
-        run: pnpm install
+      - name: Install Pnpm
+        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        with:
+          run_install: true
 
       - name: Build
         run: pnpm build
diff --git a/src/createTarball.ts b/src/createTarball.ts
index 418d6f7..b0a085c 100644
--- a/src/createTarball.ts
+++ b/src/createTarball.ts
@@ -26,7 +26,7 @@ export async function createTarball(
         return ["yarn", ["pack", "--filename", tarballPath]];
       case "yarn@berry":
         // https://yarnpkg.com/cli/pack
-        return ["yarn", ["pack", "--out", tarballPath]];
+        return ["corepack", ["yarn", "pack", "--out", tarballPath]];
       case "pnpm":
       case "pnpm@6":
         return ["pnpm", ["pack"]];