diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml
index 2c0a309b39a6d..68fed0bf762db 100644
--- a/.github/workflows/ci-go.yml
+++ b/.github/workflows/ci-go.yml
@@ -27,20 +27,11 @@ jobs:
           go-version: 1.18.0
         id: go
 
-      # Can re-enable when https://github.com/pnpm/action-setup/issues/44 is fixed
-      # - uses: pnpm/action-setup@v2.2.1
-      #   with:
-      #     version: 6.32.11
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v2
         with:
-          node-version: 16
-
-      - name: Install pnpm
-        run: npm install -g pnpm@6.32.11
+          version: 6.32.11
 
-      - name: Setup Node.js environment, now with pnpm
+      - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
           node-version: 16
@@ -76,7 +67,7 @@ jobs:
           go-version: 1.18.0
         id: wingo
 
-      - uses: pnpm/action-setup@v2.1.0
+      - uses: pnpm/action-setup@v2
         with:
           version: 6.32.11
 
@@ -137,19 +128,11 @@ jobs:
           go-version: 1.18.0
         id: go
 
-      # - uses: pnpm/action-setup@v2.2.1
-      #   with:
-      #     version: 6.32.11
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v2
         with:
-          node-version: 16
-
-      - name: Install pnpm
-        run: npm install -g pnpm@6.32.11
+          version: 6.32.11
 
-      - name: Setup Node.js environment, now with pnpm
+      - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
           node-version: 16