diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml
index 82dc3d6c8431c..2833c559f8011 100644
--- a/.github/workflows/ci-go.yml
+++ b/.github/workflows/ci-go.yml
@@ -27,11 +27,20 @@ jobs:
           go-version: 1.18.0
         id: go
 
-      - uses: pnpm/action-setup@v2.1.0
-        with:
-          version: 6.32.11
+      # 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
+        with:
+          node-version: 16
+
+      - name: Install pnpm
+        run: npm install -g pnpm@6.32.11
+
+      - name: Setup Node.js environment, now with pnpm
         uses: actions/setup-node@v3
         with:
           node-version: 16
@@ -131,11 +140,19 @@ jobs:
           go-version: 1.18.0
         id: go
 
-      - uses: pnpm/action-setup@v2.1.0
-        with:
-          version: 6.32.11
+      # - uses: pnpm/action-setup@v2.2.1
+      #   with:
+      #     version: 6.32.11
 
       - name: Setup Node.js environment
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Install pnpm
+        run: npm install -g pnpm@6.32.11
+
+      - name: Setup Node.js environment, now with pnpm
         uses: actions/setup-node@v3
         with:
           node-version: 16