diff --git a/.github/workflows/baseimage.yaml b/.github/workflows/baseimage.yaml
index 0d33f7f07f..0f0e7d8c8e 100644
--- a/.github/workflows/baseimage.yaml
+++ b/.github/workflows/baseimage.yaml
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v6.0.9
         with:
           version: 10
       - name: Docker build
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c71da5d6e5..041de25949 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -670,7 +670,7 @@ jobs:
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v6.0.9
         with:
           version: 10
       - name: Cache node modules