diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 382a0c7..3c0e865 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -158,7 +158,7 @@ jobs:
           TAGS="${{ steps.meta.outputs.tags }}"
           args=""
 
-          image=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{github.sha}}
+          image=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           image=${image,,}
 
           # Create tag arguments
@@ -167,14 +167,14 @@ jobs:
           done
 
           if [ "${{ github.ref_type }}" == "tag" ]; then
-            args="$args -t latest"
+            args="$args -t ${image}:latest"
           fi
 
           echo $args
 
           docker buildx imagetools create $args \
-          ${image}-amd64 \
-          ${image}-arm64
+          ${image}:${{github.sha}}-amd64 \
+          ${image}:${{github.sha}}-arm64
 
       # Sign the manifest
       - name: Sign the manifests