diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 35825d4..daed0e5 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,6 +17,8 @@ env:
   # Use docker.io for Docker Hub if empty
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+  
   IMAGE_NAME_ARM64: ${{ github.repository }}:${{ github.ref_name }}-arm64
 
   IMAGE_NAME_AMD64: ${{ github.repository }}:${{ github.ref_name }}-amd64
@@ -84,7 +86,7 @@ jobs:
           context: .
           file: dockerfile-arm64
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta-arm64.outputs.tags }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_ARM64 }}
           labels: ${{ steps.meta-arm64.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -97,7 +99,7 @@ jobs:
           context: .
           file: dockerfile-amd64
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta-amd64.outputs.tags }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_AMD64 }}
           labels: ${{ steps.meta-amd64.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max