diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 629f4c0cc..779bd2d6b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,18 +23,17 @@ jobs:
           submodules: recursive
 
       - name: Cache regression-tests
-        id: cache-regression
+        id: regression-tests
         uses: actions/cache@v3
         env:
           cache-name: cache-regression-tests
         with:
           path: test/external/riscv-tests/test-*
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{
-            hashFiles('**/riscv-tests/test-*') }}
+          key: ${{ env.cache-name }}-${{ runner.os }}-${{
+            job.container.id }}-${{ hashFiles('**/riscv-tests/test-*') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            ${{ env.cache-name }}-${{ runner.os }}-${{
+              job.container.id }}
 
       - if: ${{ steps.cache-regression.outputs.cache-hit != 'true' }}
         name: Build riscv-tests
@@ -72,12 +71,11 @@ jobs:
           cache-name: cache-regression-tests
         with:
           path: test/external/riscv-tests/test-*
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{
-            hashFiles('**/riscv-tests/test-*') }}
+          key: ${{ env.cache-name }}-${{ runner.os }}-${{
+            job.container.id }}-${{ hashFiles('**/riscv-tests/test-*') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            ${{ env.cache-name }}-${{ runner.os }}-${{
+              job.container.id }}
 
       - name: Run tests
         run: |