diff --git a/.github/workflows/release-images.yml b/.github/workflows/release-images.yml
index 7d75de0..3267059 100644
--- a/.github/workflows/release-images.yml
+++ b/.github/workflows/release-images.yml
@@ -23,9 +23,9 @@ jobs:
       run: |
         for dir in */; do
           dir=${dir%*/}
-          image_name=$(echo $dir | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')
+          image_name=${{ github.repository }}-$(echo $dir | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')
           tag=${{ github.sha }}
-          docker buildx build -t ghcr.io/${{ github.repository }}/$$image_name:$$tag -f ./$dir/Dockerfile ./$dir -o type=registry,registry.insecure=true
+          docker buildx build -t ghcr.io/${{ github.repository_owner }}/$$image_name:$$tag -f ./$dir/Dockerfile ./$dir -o type=registry,registry.insecure=true
         done
         done