diff --git a/.github/workflows/build-and-push-docker-base-image.yml b/.github/workflows/build-and-push-docker-base-image.yml
index 427435d..2cb2dac 100644
--- a/.github/workflows/build-and-push-docker-base-image.yml
+++ b/.github/workflows/build-and-push-docker-base-image.yml
@@ -40,5 +40,5 @@ jobs:
           build-args: ALPINE_VERSION=${{ env.ALPINE_VERSION }}
           push: true
           tags: |
-            ghcr.io/plankanban/planka:base-latest
-            ghcr.io/plankanban/planka:base-${{ env.ALPINE_VERSION }}
+            ghcr.io/${{ github.repository_owner }}/${{ github.repository }}:base-latest
+            ghcr.io/${{ github.repository_owner }}/${{ github.repository }}:base-${{ env.ALPINE_VERSION }}
diff --git a/.github/workflows/build-and-push-docker-image-dev.yml b/.github/workflows/build-and-push-docker-image-dev.yml
index 7b591f2..fa5b98d 100644
--- a/.github/workflows/build-and-push-docker-image-dev.yml
+++ b/.github/workflows/build-and-push-docker-image-dev.yml
@@ -11,7 +11,7 @@ on:
     branches: [master]
 
 env:
-  REGISTRY_IMAGE: ghcr.io/plankanban/planka
+  REGISTRY_IMAGE: ghcr.io/${{ github.repository_owner }}/${{ github.repository }}
 
 jobs:
   build: