diff --git a/.github/actions/pnpm-install/action.yml b/.github/actions/pnpm-install/action.yml
index b7d10b2108c4..9b5cd3893426 100644
--- a/.github/actions/pnpm-install/action.yml
+++ b/.github/actions/pnpm-install/action.yml
@@ -9,14 +9,12 @@ runs:
         path: |
           node_modules
           **/node_modules
-          /home/runner/.cache/pnpm
-          /home/runner/.cache/Cypress
-          /home/runner/.pnpm-store
-        key: pnpm-${{ runner.os }}-${{ hashFiles('./pnpm-lock.yaml') }}
+        key: node_modules-${{ runner.os }}-${{ hashFiles('./pnpm-lock.yaml', '.nvmrc') }}
+    - uses: pnpm/action-setup@v4
     - uses: actions/setup-node@v4
       with:
-        node-version-file: .nvmrc
-    - uses: pnpm/action-setup@v4
+        cache: 'pnpm'
+        node-version-file: '.nvmrc'
     - run: pnpm --version
       shell: bash
     - run: pnpm i --frozen-lockfile