diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8ffedfb4b0344..c2e5ce0855055 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -74,7 +74,7 @@ commands:
     steps:
       - run:
           name: Install PNPM
-          command: npm install --prefix=$HOME/.local -g pnpm@7.30.3
+          command: npm install --prefix=$HOME/.local -g @pnpm/exe@8.3.1
 
   setup:
     parameters:
diff --git a/.github/workflows/e2e-matrix.yml b/.github/workflows/e2e-matrix.yml
index bbcf3e9adbcfa..0d2d77d8ad10e 100644
--- a/.github/workflows/e2e-matrix.yml
+++ b/.github/workflows/e2e-matrix.yml
@@ -321,9 +321,8 @@ jobs:
 
       - name: Install PNPM
         if: ${{ matrix.package_manager == 'pnpm' }}
-        uses: pnpm/action-setup@v2
-        with:
-          version: 7.30.5
+        run: |
+          npm install -g @pnpm/exe@8.3.1
 
       - name: Use Node.js ${{ matrix.node_version }}
         uses: actions/setup-node@v3