diff --git a/.github/workflows/production-image.yml b/.github/workflows/production-image.yml
index e2d2f448..63860053 100644
--- a/.github/workflows/production-image.yml
+++ b/.github/workflows/production-image.yml
@@ -28,9 +28,8 @@ jobs:
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Bake and push
         uses: docker/bake-action@v4
diff --git a/compose.yaml b/compose.yaml
index 1208977d..b9443b9b 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,5 +1,5 @@
 x-customizable-image: &customizable_image
-  image: ghcr.io/zapal-tech/erp:latest
+  image: zapal/erp:latest
 
 x-depends-on-configurator: &depends_on_configurator
   depends_on:
diff --git a/docker-bake.hcl b/docker-bake.hcl
index b5a9d5f0..6ed20308 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,5 +1,5 @@
 variable "REGISTRY_USER" {
-    default = "zapal-tech"
+    default = "zapal"
 }
 
 variable PYTHON_VERSION {
@@ -74,7 +74,7 @@ group "default" {
 
 function "tag" {
     params = [repo, version]
-    result = ["ghcr.io/${REGISTRY_USER}/${repo}:latest", "ghcr.io/${REGISTRY_USER}/${repo}:${version}"]
+    result = ["${REGISTRY_USER}/${repo}:latest", "${REGISTRY_USER}/${repo}:${version}"]
 }
 
 target "default-args" {
diff --git a/docker-compose.yml b/docker-compose.yml
index f3057c62..bced01cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal/erp:latest
     networks:
       default: null
     volumes:
@@ -36,7 +36,7 @@ services:
       REDIS_CACHE: redis-cache:6379
       REDIS_QUEUE: redis-queue:6379
       SOCKETIO_PORT: "9000"
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal/erp:latest
     networks:
       default: null
     volumes:
@@ -85,7 +85,7 @@ services:
       UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1
       UPSTREAM_REAL_IP_HEADER: X-Forwarded-For
       UPSTREAM_REAL_IP_RECURSIVE: "off"
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal/erp:latest
     networks:
       default: null
     volumes:
@@ -104,7 +104,7 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal/erp:latest
     networks:
       default: null
     volumes:
@@ -122,7 +122,7 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal/erp:latest
     networks:
       default: null
     volumes:
@@ -156,7 +156,7 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal/erp:latest
     networks:
       default: null
     volumes:
@@ -172,7 +172,7 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal/erp:latest
     networks:
       default: null
     volumes:
@@ -197,11 +197,11 @@ x-backend-defaults:
   depends_on:
     configurator:
       condition: service_completed_successfully
-  image: ghcr.io/zapal-tech/erp:latest
+  image: zapal/erp:latest
   volumes:
     - erp-bench:/home/zapal/frappe-bench
 x-customizable-image:
-  image: ghcr.io/zapal-tech/erp:latest
+  image: zapal/erp:latest
 x-depends-on-configurator:
   depends_on:
     configurator: