diff --git a/.github/workflows/build-push-image.yml b/.github/workflows/build-push-image.yml
index c87848d..43200a1 100644
--- a/.github/workflows/build-push-image.yml
+++ b/.github/workflows/build-push-image.yml
@@ -316,7 +316,7 @@ jobs:
       - name: Get the container image from the registry
         # It contains the image and the signatures
         run: |-
-          cosign save ${{ needs.merge.outputs.image_uri }} --dir tmp
+          cosign save $IMAGE_URI --dir tmp
           cd tmp
           tar -cvf ../share/container.tar
           cd ..
@@ -325,7 +325,7 @@ jobs:
         id: cache-container-image
         uses: actions/cache@v4
         with:
-          key: v6-container-${{ needs.merge.outputs.image_uri }}
+          key: v6-container-${{ inputs.registry }}/${{ inputs.image_name }}:${{ needs.merge.outputs.tag }}@${{ needs.merge.outputs.digest_root }}"
           path: |-
             share/container.tar