diff --git a/.github/workflows/api-verification.yml b/.github/workflows/api-verification.yml
index 42604ea1dc..68499a67d2 100644
--- a/.github/workflows/api-verification.yml
+++ b/.github/workflows/api-verification.yml
@@ -22,22 +22,21 @@ jobs:
       GIT_BRANCH: ${{ steps.environment_step.outputs.GIT_BRANCH }}
       GIT_BASE_BRANCH: ${{ steps.environment_step.outputs.GIT_BASE_BRANCH }}
       GIT_USER: ${{ steps.environment_step.outputs.GIT_USER }}
-      ARTIFACTS_KEY: ${{ steps.environment_step.outputs.ARTIFACTS_KEY }}
 
     steps:
-    - name: Read environment
-      id: environment_step
-      run: |
-        cat artifacts/env >> $GITHUB_OUTPUT
-
     - name: Restore artifacts
       uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: |
           artifacts
-        key: ${ARTIFACTS_KEY}
+        key: artifacts-key-${{ github.event.workflow_run.id }}
         restore-keys: artifacts-key-
 
+    - name: Read environment
+      id: environment_step
+      run: |
+        cat artifacts/env >> $GITHUB_OUTPUT
+
   api_verification:
     name: Verify API for libkeymancore.so
     needs: setup_environment
diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index 8195ee82d2..1876be35b7 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -313,14 +313,13 @@ jobs:
         echo "GIT_BRANCH=${{ github.event.client_payload.branch }}" >> artifacts/env
         echo "GIT_BASE_BRANCH=${{ github.event.client_payload.baseBranch }}" >> artifacts/env
         echo "GIT_USER=${{ github.event.client_payload.user }}" >> artifacts/env
-        echo "ARTIFACTS_KEY=artifacts-key-${GITHUB_RUN_ID}" >> artifacts/env
 
     - name: Cache artifacts
       uses: actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: |
           artifacts
-        key: ${ARTIFACTS_KEY}
+        key: artifacts-key-${{ github.run_id }}
 
   # We intentionally ignore the results of binary_packages_unreleased
   set_status: