diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c454739..2c2f46c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: false
-          tags: kopano_repo_helper
+          tags: zokradonh/kopano_repo_helper
           context: repo
           cache-from: type=local,src=/tmp/.kopano-repo-helper-cache
           cache-to: type=local,dest=/tmp/.kopano-repo-helper-cache-new,mode=max
diff --git a/Makefile b/Makefile
index 5428294..ef39c08 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ build-repo:
 		--build-arg KOPANO_WEBAPP_SMIME_REPOSITORY_URL=$(KOPANO_WEBAPP_SMIME_REPOSITORY_URL) \
 		--build-arg KOPANO_ZPUSH_REPOSITORY_URL=$(KOPANO_ZPUSH_REPOSITORY_URL) \
 		--build-arg DOWNLOAD_COMMUNITY_PACKAGES=$(DOWNLOAD_COMMUNITY_PACKAGES) \
-		-t kopano_repo_helper repo/
+		-t zokradonh/kopano_repo_helper repo/
 
 .PHONY: build
 build: component ?= base
diff --git a/base/Dockerfile b/base/Dockerfile
index 38dc0f6..dd3a5a5 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -59,7 +59,7 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
 # get common utilities
 COPY kcconf.py defaultconfigs/ /kopano/
 # add apt key for later use
-RUN --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=kopano_repo_helper \
+RUN --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=zokradonh/kopano_repo_helper \
     APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /kopano/repo/Release.key
 
 # TODO: replace by org.opencontainers.image.* and set by GitHub Action instead of Dockerfile LABEL-instruction. Only set labels that might be useful in local builds
diff --git a/core/Dockerfile b/core/Dockerfile
index 2117439..1e5d8d5 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -31,8 +31,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # install Kopano Core and refresh ca-certificates
 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
-    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=kopano_repo_helper \
-    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=kopano_repo_helper \
+    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=zokradonh/kopano_repo_helper \
+    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=zokradonh/kopano_repo_helper \
     # install
     apt-get update && \
     set -x && \
diff --git a/kapps/Dockerfile b/kapps/Dockerfile
index 07e5f51..f028632 100644
--- a/kapps/Dockerfile
+++ b/kapps/Dockerfile
@@ -23,8 +23,8 @@ LABEL maintainer=az@zok.xyz \
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
-    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=kopano_repo_helper \
-    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=kopano_repo_helper \
+    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=zokradonh/kopano_repo_helper \
+    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=zokradonh/kopano_repo_helper \
     # install
     apt-get update && \
     # TODO mime-support could be remove once its an official dependency of kopano-kwebd
diff --git a/kdav/Dockerfile b/kdav/Dockerfile
index 0ec380a..fa7e9a9 100644
--- a/kdav/Dockerfile
+++ b/kdav/Dockerfile
@@ -25,8 +25,8 @@ LABEL maintainer=az@zok.xyz \
 
 # install Kopano kDAV
 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
-    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=kopano_repo_helper \
-    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=kopano_repo_helper \
+    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=zokradonh/kopano_repo_helper \
+    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=zokradonh/kopano_repo_helper \
     set -x && \
     apt-get update && apt-get install -y --no-install-recommends \
         php-mbstring \
diff --git a/meet/Dockerfile b/meet/Dockerfile
index 5101369..ff79d2a 100644
--- a/meet/Dockerfile
+++ b/meet/Dockerfile
@@ -24,8 +24,8 @@ LABEL maintainer=az@zok.xyz \
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
-    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=kopano_repo_helper \
-    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=kopano_repo_helper \
+    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=zokradonh/kopano_repo_helper \
+    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=zokradonh/kopano_repo_helper \
     # install
     apt-get update && \
     # TODO mime-support could be remove once its an official dependency of kopano-kwebd
diff --git a/php/Dockerfile b/php/Dockerfile
index 0fe1794..e5c60ac 100644
--- a/php/Dockerfile
+++ b/php/Dockerfile
@@ -23,8 +23,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # add install common php dependencies
 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
-    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=kopano_repo_helper \
-    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=kopano_repo_helper \
+    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=zokradonh/kopano_repo_helper \
+    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=zokradonh/kopano_repo_helper \
     # install
     set -x && \
     apt-get update && apt-get install -y --no-install-recommends \
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 0730392..0b6767c 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -28,8 +28,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # install Kopano WebApp
 # hadolint ignore=SC2129
 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
-    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=kopano_repo_helper \
-    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=kopano_repo_helper \
+    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=zokradonh/kopano_repo_helper \
+    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=zokradonh/kopano_repo_helper \
     # install
     set -x && \
     apt-get update && apt-get install -y --no-install-recommends \
diff --git a/zpush/Dockerfile b/zpush/Dockerfile
index dfac816..b094706 100644
--- a/zpush/Dockerfile
+++ b/zpush/Dockerfile
@@ -29,8 +29,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # hadolint currently does not understand the extended buildkit syntax https://github.com/hadolint/hadolint/issues/347
 # hadolint ignore=DL3015
 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
-    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=kopano_repo_helper \
-    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=kopano_repo_helper \
+    --mount=type=bind,target=/kopano/repo,source=/kopano/repo,from=zokradonh/kopano_repo_helper \
+    --mount=type=bind,target=/etc/apt/sources.list.d/,source=/etc/apt/sources.list.d/,from=zokradonh/kopano_repo_helper \
     # install
     set -x && \
     # TODO set IGNORE_FIXSTATES_ON_UPGRADE https://jira.z-hub.io/browse/ZP-1164