diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 22e35f3..48e016e 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -18,8 +18,8 @@ on:
 env:
   # Use docker.io for Docker Hub if empty
   REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
+  # github.repository owner
+  REPOSITORY: ${{ github.repository_owner }}
 
 
 jobs:
@@ -76,7 +76,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
-          images: ${{ env.REGISTRY }}/${{ matrix.image }}
+          images: ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/${{ matrix.image }}
 
       # Build and push image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action