diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c58796b8c..6bf1bc51e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,18 +32,18 @@ jobs:
           cache-name: cache-regression-tests
         with:
           path: test/external/riscv-tests/test-*
-          key: ${{ env.cache-name }}-${{ runner.os }}-${{
-            job.container.id }}-${{ hashFiles(
+          key: ${{ env.cache-name }}-${{ runner.os }}-dummy_id-${{ hashFiles(
               '**/test/external/riscv-tests/environment/**',
               '**/test/external/riscv-tests/Makefile}'
             ) }}
           restore-keys: |
-            ${{ env.cache-name }}-${{ runner.os }}-${{ job.container.id }}-
+            ${{ env.cache-name }}-${{ runner.os }}-dummy_id-
 
       - if: ${{ steps.cache-regression.outputs.cache-hit != 'true' }}
         run: cd test/external/riscv-tests && make
 
-      - name: Upload riscv-tests
+      - if: ${{ steps.cache-regression.outputs.cache-hit != 'true' }}
+        name: Upload riscv-tests
         uses: actions/upload-artifact@v3
         with:
           path: test/external/riscv-tests
@@ -82,8 +82,7 @@ jobs:
           cache-name: cache-regression-tests
         with:
           path: test/external/riscv-tests/test-*
-          key: ${{ env.cache-name }}-${{ runner.os }}-${{
-            needs.build-regression-tests.outputs.container_id }}-${{ hashFiles(
+          key: ${{ env.cache-name }}-${{ runner.os }}-dummy_id-${{ hashFiles(
               '**/test/external/riscv-tests/environment/**',
               '**/test/external/riscv-tests/Makefile}'
             ) }}