diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index e66b3d4..dfa432b 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -13,12 +13,12 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Log in to Forgejo package registry
+    - name: Log in to package registry
       uses: docker/login-action@v1
       with:
         registry: https://code.cozy.town/
-        username: ${{ secrets.FORGEJO_USERNAME }}
-        password: ${{ secrets.FORGEJO_TOKEN }}
+        username: ${{ secrets.REGISTRY_USERNAME }}
+        password: ${{ secrets.REGISTRY_TOKEN }}
 
     - name: Build and push Base image
       uses: docker/build-push-action@v2
@@ -26,7 +26,7 @@ jobs:
         context: .
         file: ./container/base/Dockerfile
         push: true
-        tags: codeforleipzig/stadtratmonitor:latest
+        tags: ${{ secrets.REGISTRY_USERNAME }}/stadtratmonitor:base-latest
 
     - name: Build and push Deploy image
       uses: docker/build-push-action@v2
@@ -34,7 +34,7 @@ jobs:
         context: .
         file: ./container/deploy/Dockerfile
         push: true
-        tags: codeforleipzig/stadtratmonitor-deploy:latest
+        tags: ${{ secrets.REGISTRY_USERNAME }}/stadtratmonitor:deploy-latest
 
     - name: Build and push Develop image
       uses: docker/build-push-action@v2
@@ -42,7 +42,7 @@ jobs:
         context: .
         file: ./container/develtop/Dockerfile
         push: true
-        tags: codeforleipzig/stadtratmonitor-develop:latest
+        tags: ${{ secrets.REGISTRY_USERNAME }}/stadtratmonitor:develop-latest
 
     - name: Build and push Test image
       uses: docker/build-push-action@v2
@@ -50,4 +50,4 @@ jobs:
         context: .
         file: ./container/test/Dockerfile
         push: true
-        tags: codeforleipzig/stadtratmonitor-test:latest
\ No newline at end of file
+        tags: ${{ secrets.REGISTRY_USERNAME }}/stadtratmonitor:test-latest
\ No newline at end of file