diff --git a/.github/workflows/console.yml b/.github/workflows/console.yml
index 8cb1227a1a8..9898a44d65d 100644
--- a/.github/workflows/console.yml
+++ b/.github/workflows/console.yml
@@ -29,9 +29,7 @@ jobs:
         continue-on-error: true
         id: cache
         with:
-          key: console-${{ hashFiles('console', 'proto', '!console/dist') }}
-          restore-keys: |
-            console-
+          key: console-${{ hashFiles('console', 'proto', '!console/dist') }}-next
           path: ${{ env.cache_path }}
       - if: ${{ steps.cache.outputs.cache-hit != 'true' }}
         uses: pnpm/action-setup@v4
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 38dc8b33b79..9b7a44d93f0 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -43,9 +43,7 @@ jobs:
           continue-on-error: true
           id: cache
           with:
-            key: core-${{ hashFiles( 'go.*', 'openapi', 'cmd', 'pkg/grpc/**/*.go', 'proto', 'internal') }}
-            restore-keys: |
-              core-
+            key: core-${{ hashFiles( 'go.*', 'openapi', 'cmd', 'pkg/grpc/**/*.go', 'proto', 'internal') }}-next
             path: ${{ env.cache_path }}
         - 
           if: ${{ steps.cache.outputs.cache-hit != 'true' }}