diff --git a/docker-compose.yml b/docker-compose.yml
index 57009c5..20911e0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   zammad-backup:
     depends_on:
       - zammad-railsserver
-    image: monotek/zammad-docker-compose:zammad-postgresql${VERSION}
+    image: zammad/zammad-docker-compose:zammad-postgresql${VERSION}
     labels:
       io.rancher.container.pull_image: always
     links:
@@ -18,7 +18,7 @@ services:
     command: zammad-backup
 
   zammad-elasticsearch:
-    image: monotek/zammad-docker-compose:zammad-elasticsearch${VERSION}
+    image: zammad/zammad-docker-compose:zammad-elasticsearch${VERSION}
     labels:
       io.rancher.container.pull_image: always
     restart: always
@@ -28,7 +28,7 @@ services:
   zammad-nginx:
     depends_on:
       - zammad-railsserver
-    image: monotek/zammad-docker-compose:zammad-nginx${VERSION}
+    image: zammad/zammad-docker-compose:zammad-nginx${VERSION}
     labels:
       io.rancher.container.pull_image: always
     links:
@@ -39,7 +39,7 @@ services:
       - data-zammad:/home/zammad
 
   zammad-postgresql:
-    image: monotek/zammad-docker-compose:zammad-postgresql${VERSION}
+    image: zammad/zammad-docker-compose:zammad-postgresql${VERSION}
     labels:
       io.rancher.container.pull_image: always
     restart: always
@@ -47,7 +47,7 @@ services:
   zammad-railsserver:
     depends_on:
       - zammad-postgresql
-    image: monotek/zammad-docker-compose:zammad${VERSION}
+    image: zammad/zammad-docker-compose:zammad${VERSION}
     labels:
       io.rancher.container.pull_image: always
     links:
@@ -61,7 +61,7 @@ services:
   zammad-scheduler:
     depends_on:
       - zammad-railsserver
-    image: monotek/zammad-docker-compose:zammad${VERSION}
+    image: zammad/zammad-docker-compose:zammad${VERSION}
     labels:
       io.rancher.container.pull_image: always
     links:
@@ -75,7 +75,7 @@ services:
   zammad-websocket:
     depends_on:
       - zammad-railsserver
-    image: monotek/zammad-docker-compose:zammad${VERSION}
+    image: zammad/zammad-docker-compose:zammad${VERSION}
     labels:
       io.rancher.container.pull_image: always
     links:
diff --git a/kubernetes/50_statefulset_postgesql.yaml b/kubernetes/50_statefulset_postgesql.yaml
index 37d505b..d0a7754 100644
--- a/kubernetes/50_statefulset_postgesql.yaml
+++ b/kubernetes/50_statefulset_postgesql.yaml
@@ -22,7 +22,7 @@ spec:
           claimName: zammad-postgresql
       containers:
       - name: zammad-postgresql
-        image: monotek/zammad-docker-compose:zammad-postgresql
+        image: zammad/zammad-docker-compose:zammad-postgresql
         ports:
         - containerPort: 5432
           name: postgresql
diff --git a/kubernetes/51_statefulset_elasticsearch.yaml b/kubernetes/51_statefulset_elasticsearch.yaml
index 6e8493a..2c8f1b8 100644
--- a/kubernetes/51_statefulset_elasticsearch.yaml
+++ b/kubernetes/51_statefulset_elasticsearch.yaml
@@ -28,7 +28,7 @@ spec:
           privileged: true
       containers:
       - name: zammad-elasticsearch
-        image: monotek/zammad-docker-compose:zammad-elasticsearch
+        image: zammad/zammad-docker-compose:zammad-elasticsearch
         ports:
         - containerPort: 9200
           name: elasticsearch
diff --git a/kubernetes/52_statefulset_railsserver.yaml b/kubernetes/52_statefulset_railsserver.yaml
index 2c68802..c28818b 100644
--- a/kubernetes/52_statefulset_railsserver.yaml
+++ b/kubernetes/52_statefulset_railsserver.yaml
@@ -22,7 +22,7 @@ spec:
           claimName: zammad-home
       containers:
       - name: zammad-railsserver
-        image: monotek/zammad-docker-compose:zammad
+        image: zammad/zammad-docker-compose:zammad
         imagePullPolicy: Always
         args: ["zammad-railsserver"]
         ports:
@@ -32,4 +32,4 @@ spec:
           privileged: true
         volumeMounts:
         - mountPath: /home/zammad
-          name: zammad-home          
+          name: zammad-home
diff --git a/kubernetes/53_statefulset_websocket.yaml b/kubernetes/53_statefulset_websocket.yaml
index 2a1ced3..4508395 100644
--- a/kubernetes/53_statefulset_websocket.yaml
+++ b/kubernetes/53_statefulset_websocket.yaml
@@ -22,7 +22,7 @@ spec:
           claimName: zammad-home
       containers:
       - name: zammad-websocket
-        image: monotek/zammad-docker-compose:zammad
+        image: zammad/zammad-docker-compose:zammad
         args: [ "zammad-websocket" ]
         ports:
         - containerPort: 6042
diff --git a/kubernetes/54_statefulset_nginx.yaml b/kubernetes/54_statefulset_nginx.yaml
index 651af47..cc0e593 100644
--- a/kubernetes/54_statefulset_nginx.yaml
+++ b/kubernetes/54_statefulset_nginx.yaml
@@ -22,7 +22,7 @@ spec:
           claimName: zammad-home
       containers:
       - name: zammad-nginx
-        image: monotek/zammad-docker-compose:zammad-nginx
+        image: zammad/zammad-docker-compose:zammad-nginx
         ports:
         - containerPort: 80
           name: nginx
diff --git a/kubernetes/55_statefulset_scheduler.yaml b/kubernetes/55_statefulset_scheduler.yaml
index 49ed77c..8ddbac5 100644
--- a/kubernetes/55_statefulset_scheduler.yaml
+++ b/kubernetes/55_statefulset_scheduler.yaml
@@ -19,10 +19,10 @@ spec:
       volumes:
       - name: zammad-home
         persistentVolumeClaim:
-          claimName: zammad-home    
+          claimName: zammad-home
       containers:
       - name: zammad-scheduler
-        image: monotek/zammad-docker-compose:zammad
+        image: zammad/zammad-docker-compose:zammad
         args: [ "zammad-scheduler" ]
         imagePullPolicy: Always
         securityContext:
diff --git a/kubernetes/56_statefulset_nfs.yaml b/kubernetes/56_statefulset_nfs.yaml
index a9e8ac6..48bf06b 100644
--- a/kubernetes/56_statefulset_nfs.yaml
+++ b/kubernetes/56_statefulset_nfs.yaml
@@ -18,7 +18,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
       - name: zammad-nfs
-        image: monotek/zammad-docker-compose:zammad-nfs
+        image: zammad/zammad-docker-compose:zammad-nfs
         args: [ "zammad-nfs" ]
         imagePullPolicy: Always
         ports: