diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0fe7b51b..c5085d95 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -178,7 +178,7 @@ jobs:
         with:
           context: .
           push: false
-          tags: ${{ steps.set_variable.outputs.IMAGE_LATEST_NAME }},${{ steps.set_variable.outputs.IMAGE_FULL_NAME }}
+          tags: ${{ env.IMAGE_LATEST_NAME }},${{ env.IMAGE_FULL_NAME }}
           platforms: linux/amd64,linux/arm64
-          cache-from: type=registry,ref=${{ steps.set_variable.outputs.IMAGE_CACHE_NAME }}
-          cache-to: type=registry,ref=${{ steps.set_variable.outputs.IMAGE_FULL_NAME }}:cache,mode=max
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_NAME }}
+          cache-to: type=registry,ref=${{ env.IMAGE_FULL_NAME }},mode=max
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 864c7e60..4703e116 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -36,6 +36,7 @@ jobs:
             echo "SOPS_SEC_OPERATOR_VERSION=$(make image_tag)" >> $GITHUB_ENV
             echo "IMAGE_FULL_NAME=$(make image_full_name)" >> $GITHUB_ENV
             echo "IMAGE_LATEST_NAME=$(make image_latest_name)" >> $GITHUB_ENV
+            echo "IMAGE_CACHE_NAME=$(make image_cache_name)" >> $GITHUB_ENV
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -70,7 +71,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ steps.set_variables.outputs.IMAGE_LATEST_NAME }},${{ steps.set_variables.outputs.IMAGE_FULL_NAME }}
+          tags: ${{ env.IMAGE_LATEST_NAME }},${{ env.IMAGE_FULL_NAME }}
           platforms: linux/amd64,linux/arm64
-          cache-from: type=registry,ref=isindir/sops-secrets-operator:cache
-          cache-to: type=registry,ref=isindir/sops-secrets-operator:cache,mode=max
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_NAME }}
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_NAME }},mode=max