diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 8b9a8b2f..3d84f732 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -18,9 +18,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up pnpm
-        uses: pnpm/action-setup@v2.0.1
+        uses: pnpm/action-setup@v4
         with:
-          version: 6
           # Only install what we need to run the client in-action and tests against it
           # format:    `--filter <packagename>...`
           run_install: |
diff --git a/.github/workflows/deploy-embeds.yml b/.github/workflows/deploy-embeds.yml
index 01b62dd4..78193262 100644
--- a/.github/workflows/deploy-embeds.yml
+++ b/.github/workflows/deploy-embeds.yml
@@ -11,7 +11,6 @@ on:
 
 env:
   NODE_VERSION: "20"
-  PNPM_VERSION: "8"
 
 jobs:
   build-and-deploy-embeds:
@@ -28,9 +27,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: ${{ env.PNPM_VERSION }}
+        uses: pnpm/action-setup@v4
 
       - name: Get pnpm store directory
         shell: bash
diff --git a/.github/workflows/deploy-storybook.yml b/.github/workflows/deploy-storybook.yml
index 700dc420..7a9cc216 100644
--- a/.github/workflows/deploy-storybook.yml
+++ b/.github/workflows/deploy-storybook.yml
@@ -11,7 +11,6 @@ on:
 
 env:
   NODE_VERSION: "20"
-  PNPM_VERSION: "8"
 
 jobs:
   build-and-deploy-storybook:
@@ -28,9 +27,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: ${{ env.PNPM_VERSION }}
+        uses: pnpm/action-setup@v4
 
       - name: Get pnpm store directory
         shell: bash
diff --git a/.github/workflows/upload-openapi-spec.yml b/.github/workflows/upload-openapi-spec.yml
index 623e9057..11af2595 100644
--- a/.github/workflows/upload-openapi-spec.yml
+++ b/.github/workflows/upload-openapi-spec.yml
@@ -9,7 +9,6 @@ on:
 
 env:
   NODE_VERSION: '20'
-  PNPM_VERSION: '8'
 
 jobs:
   generate-and-upload-openapi:
@@ -26,9 +25,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: ${{ env.PNPM_VERSION }}
+        uses: pnpm/action-setup@v4
 
       - name: Get pnpm store directory
         shell: bash