diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index decec536..652d3093 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,13 +12,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2.0.1
+        with:
+          version: 6
       - uses: actions/setup-node@v2
         with:
           node-version: 16
           cache: pnpm
           registry-url: https://registry.npmjs.org
-      - name: Setup pnpm
-        run: npm add -g pnpm@6
       - name: Install dependencies
         run: pnpm install
       - name: Check formatting
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 61ca3d82..31c5cc5b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,13 +13,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2.0.1
+        with:
+          version: 6
       - uses: actions/setup-node@v2
         with:
           node-version: 16
           cache: pnpm
           registry-url: https://registry.npmjs.org
-      - name: Setup pnpm
-        run: npm add -g pnpm@6
       - name: Install dependencies
         run: pnpm install
       - name: Check formatting