diff --git a/.github/workflows/docker-base.yml b/.github/workflows/docker-base.yml
index 70387f519..cfbd1f8dc 100644
--- a/.github/workflows/docker-base.yml
+++ b/.github/workflows/docker-base.yml
@@ -39,4 +39,4 @@ jobs:
           push: true
           file: extras/docker/base/Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-          tags: wger/base:latest,wger/base:2.2-dev
+          tags: ${{ env.REGISTRY_REPO }}/base:latest,${{ env.REGISTRY_REPO }}/base:2.2-dev
diff --git a/.github/workflows/docker-demo.yml b/.github/workflows/docker-demo.yml
index 8d83a11f5..f3e6c9379 100644
--- a/.github/workflows/docker-demo.yml
+++ b/.github/workflows/docker-demo.yml
@@ -41,4 +41,4 @@ jobs:
           push: true
           file: extras/docker/demo/Dockerfile
           platforms: linux/amd64,linux/arm64
-          tags: wger/demo:latest,wger/demo:2.2-dev,wger/apache:latest,wger/apache:2.2-dev
+          tags: ${{ env.REGISTRY_REPO }}/demo:latest,${{ env.REGISTRY_REPO }}/demo:2.2-dev,${{ env.REGISTRY_REPO }}/apache:latest,${{ env.REGISTRY_REPO }}/apache:2.2-dev
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bc2bdd9a1..b1518542d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,8 +8,8 @@ on:
       - master
 
 env:
-  REGISTRY_IMAGE: wger/server
-  REGISTRY_IMAGE_ALT: wger/devel
+  REGISTRY_IMAGE: ${{ env.REGISTRY_REPO }}/server
+  REGISTRY_IMAGE_ALT: ${{ env.REGISTRY_REPO }}/devel
 
 jobs:
   build-prod: