diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e7604b8f..7bae2e15 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -362,8 +362,7 @@ jobs:
       - name: Create manifest list, push it and extract digest SHA
         working-directory: ${{ runner.temp }}/digests
         env:
-          BASE_IMAGE: "${{ matrix.base_image }}"
-          BASE_IMAGE_TAG: "${{ matrix.base_image == 'debian' && '' || format('-{0}', matrix.base_image) }}"
+          BASE_IMAGE_TAG: "${{ matrix.base_image != 'debian' && format('-{0}', matrix.base_image) || '' }}"
           BASE_TAGS: "${{ env.BASE_TAGS }}"
           CONTAINER_REGISTRIES: "${{ env.CONTAINER_REGISTRIES }}"
         run: |
@@ -376,16 +375,16 @@ jobs:
 
               OUTPUT=$(docker buildx imagetools create \
                 -t "${img}:${tag}${BASE_IMAGE_TAG}" \
-                $(printf "${img}:${tag}-${BASE_IMAGE}@sha256:%s " *) 2>&1)
+                $(printf "${img}@sha256:%s " *) 2>&1)
               STATUS=$?
 
               if [ ${STATUS} -ne 0 ]; then
-                echo "Manifest creation failed for ${img}"
+                echo "Manifest creation failed for ${img}:${tag}${BASE_IMAGE_TAG}"
                 echo "${OUTPUT}"
               exit ${STATUS}
               fi
 
-              echo "Manifest created for ${img}"
+              echo "Manifest created for ${img}:${tag}${BASE_IMAGE_TAG}"
               echo "${OUTPUT}"
             done
           done