diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4706210335..1b4b732eec 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -70,16 +70,16 @@ jobs:
         key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
         restore-keys: |
           ${{ runner.os }}-pnpm-
-    - name: Install pnpm
-      uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
-      with:
-        package_json_file: ui/package.json
     - name: Install nodejs
       uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
       with:
         node-version: "24.15.0"
-        cache: "pnpm"
-        cache-dependency-path: "**/pnpm-lock.yaml"
+    - name: Install pnpm
+      uses: pnpm/action-setup@078e9d416474b29c0c387560859308974f7e9c53 # v6.0.1
+      with:
+        package_json_file: ui/package.json
+    - name: Configure pnpm store
+      run: pnpm config set store-dir ~/.pnpm-store
     - name: Run typecheck
       run: make typecheck-ui
     - name: Run linter
@@ -188,16 +188,22 @@ jobs:
       uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - name: Install tools
       run: apt update && apt install unzip
-    - name: Install pnpm
-      uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
+    - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
       with:
-        package_json_file: ui/package.json
+        path: ~/.pnpm-store
+        key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+        restore-keys: |
+          ${{ runner.os }}-pnpm-
     - name: Install nodejs
       uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
       with:
         node-version: "24.15.0"
-        cache: "pnpm"
-        cache-dependency-path: "**/pnpm-lock.yaml"
+    - name: Install pnpm
+      uses: pnpm/action-setup@078e9d416474b29c0c387560859308974f7e9c53 # v6.0.1
+      with:
+        package_json_file: ui/package.json
+    - name: Configure pnpm store
+      run: pnpm config set store-dir ~/.pnpm-store
     - name: Install nodejs dependencies
       run: pnpm install --dev
       working-directory: ./ui
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 6931505523..17f8958fee 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -199,16 +199,22 @@ jobs:
 
     - name: Checkout code
       uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-    - name: Install pnpm
-      uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
+    - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
       with:
-        package_json_file: ui/package.json
+        path: ~/.pnpm-store
+        key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+        restore-keys: |
+          ${{ runner.os }}-pnpm-
     - name: Install nodejs
       uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
       with:
         node-version: "24.15.0"
-        cache: "pnpm"
-        cache-dependency-path: "**/pnpm-lock.yaml"
+    - name: Install pnpm
+      uses: pnpm/action-setup@078e9d416474b29c0c387560859308974f7e9c53 # v6.0.1
+      with:
+        package_json_file: ui/package.json
+    - name: Configure pnpm store
+      run: pnpm config set store-dir ~/.pnpm-store
     - name: Build UI
       env:
         VERSION: ${{ github.ref_name }}