diff --git a/.github/workflows/sf-release.yml b/.github/workflows/sf-release.yml
index 9fc9673729..c316f4c62c 100644
--- a/.github/workflows/sf-release.yml
+++ b/.github/workflows/sf-release.yml
@@ -151,7 +151,12 @@ jobs:
       - name: Extract image
         id: image
         run: |
-            echo "ID=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
+          version="edge"
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            version=${GITHUB_REF#refs/tags/}
+          fi
+
+          echo "ID=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_SHA::7}-${version}" >> "$GITHUB_OUTPUT"
 
       - name: Extract assets
         if: startsWith(github.ref, 'refs/tags/')