diff --git a/roles/docker-deployments/tasks/main.yaml b/roles/docker-deployments/tasks/main.yaml
index 0fc9325..798c772 100644
--- a/roles/docker-deployments/tasks/main.yaml
+++ b/roles/docker-deployments/tasks/main.yaml
@@ -143,9 +143,10 @@
     password: HISTORY_PURGED_SECRET
 
 - name: Deploy compose templates
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "/opt/{{ item }}/"
-    pull: true
+    pull: "missing"
+    remove_orphans: true
     files:
       - "{{ item }}.yaml"
   with_items:
diff --git a/roles/docker-deployments/templates/async-icinga.yaml b/roles/docker-deployments/templates/async-icinga.yaml
index 99f0527..522a1cb 100644
--- a/roles/docker-deployments/templates/async-icinga.yaml
+++ b/roles/docker-deployments/templates/async-icinga.yaml
@@ -1,4 +1,5 @@
-async-icinga:
+services:
+  async-icinga:
     volumes:
         - "/data/async-icinga/:/app/config"
         - "/data/async-icinga/instance/:/app/instance/"
diff --git a/roles/docker-deployments/templates/athq-landing.yaml b/roles/docker-deployments/templates/athq-landing.yaml
index fa5da5e..120f5db 100644
--- a/roles/docker-deployments/templates/athq-landing.yaml
+++ b/roles/docker-deployments/templates/athq-landing.yaml
@@ -1,5 +1,6 @@
-athqlanding:
+services:
+  athqlanding:
     ports:
-        - 5002:5000
-    image: registry.atlantishq.de/athq/landing-page
+      - 5002:5000
+    image: harbor-registry.atlantishq.de/atlantishq/athq-landing-page
     restart: always
diff --git a/roles/docker-deployments/templates/atlantis-hub.yaml b/roles/docker-deployments/templates/atlantis-hub.yaml
index 809187e..a3315cb 100644
--- a/roles/docker-deployments/templates/atlantis-hub.yaml
+++ b/roles/docker-deployments/templates/atlantis-hub.yaml
@@ -1,5 +1,6 @@
-atlantis-hub:
-    image: registry.atlantishq.de/atlantis-hub:latest
+services:
+  atlantis-hub:
+    image: harbor-registry.atlantishq.de/atlantishq/atlantis-hub:latest
     restart: always
     ports:
         - 6011:5000
diff --git a/roles/docker-deployments/templates/atlantis-verify.yaml b/roles/docker-deployments/templates/atlantis-verify.yaml
index 057182a..978a561 100644
--- a/roles/docker-deployments/templates/atlantis-verify.yaml
+++ b/roles/docker-deployments/templates/atlantis-verify.yaml
@@ -1,4 +1,5 @@
-atlantis-verify:
+services:
+  atlantis-verify:
     image: harbor-registry.atlantishq.de/atlantishq/atlantis-verify:latest
     restart: always
     environment:
diff --git a/roles/docker-deployments/templates/atlantis-web-check.yaml b/roles/docker-deployments/templates/atlantis-web-check.yaml
index 21e76a2..1836c14 100644
--- a/roles/docker-deployments/templates/atlantis-web-check.yaml
+++ b/roles/docker-deployments/templates/atlantis-web-check.yaml
@@ -1,4 +1,3 @@
-version: "3.3"
 services:
     master:
         image: harbor-registry.atlantishq.de/atlantishq/atlantis-webcheck-master:latest
diff --git a/roles/docker-deployments/templates/event-dispatcher.yaml b/roles/docker-deployments/templates/event-dispatcher.yaml
index 5058385..2372db1 100644
--- a/roles/docker-deployments/templates/event-dispatcher.yaml
+++ b/roles/docker-deployments/templates/event-dispatcher.yaml
@@ -1,40 +1,41 @@
-event-dispatcher:
-    ports:
-        - 5007:5000
-    image: registry.atlantishq.de/athq/event-dispatcher
-    restart: always
-    volumes:
-        - "/data/event-dispatcher/instance/:/app/instance/"
-    environment:
-        LDAP_SERVER : "{{ ldap_connection_url }}"
-        LDAP_BIND_DN : "{{ ldap_bind_dn }}"
-        LDAP_BIND_PW : "{{ ldap_password }}"
-        LDAP_BASE_DN : "{{ ldap_user_dn }}"
-
-        DISPATCH_ACCESS_TOKEN: "{{ event_dispatcher_pass }}"
-        SETTINGS_ACCESS_TOKEN: "{{ notification_settings_access_token }}"
-
-event-dispatcher-worker:
-    image: registry.atlantishq.de/athq/event-dispatcher-worker
-
-    restart: always
-    environment:
-
-        DISPATCH_SERVER: "{{ event_dispatcher_proto }}://{{ event_dispatcher_host }}"
-        DISPATCH_ACCESS_TOKEN: "{{ event_dispatcher_pass }}"
-
-        NTFY_PUSH_TARGET: "{{ ntfy_push_target }}"
-        NTFY_USER: "admin"
-        NTFY_PASS: "{{ ntfy_api_access_token }}"
-        NTFY_API_SERVER: "{{ ntfy_api_target }}"
-        NTFY_API_TOKEN: "{{ ntfy_api_access_token }}"
-
-        LDAP_SERVER : "{{ ldap_connection_url }}"
-        LDAP_BIND_DN : "{{ ldap_bind_dn }}"
-        LDAP_BIND_PW : "{{ ldap_password }}"
-        LDAP_BASE_DN : "{{ ldap_user_dn }}"
-
-        SMTP_TARGET: "{{ smtp_internal_host }}"
-        SMTP_PORT: "{{ smtp_internal_host_port }}"
-        SMTP_USER: "{{ smtp_service_user }}@atlantishq.de"
-        SMTP_PASS: "{{ smtp_service_pass }}"
+services:
+  event-dispatcher:
+      ports:
+          - 5007:5000
+      image: harbor-registry.atlantishq.de/atlantishq/event-dispatcher
+      restart: always
+      volumes:
+          - "/data/event-dispatcher/instance/:/app/instance/"
+      environment:
+          LDAP_SERVER : "{{ ldap_connection_url }}"
+          LDAP_BIND_DN : "{{ ldap_bind_dn }}"
+          LDAP_BIND_PW : "{{ ldap_password }}"
+          LDAP_BASE_DN : "{{ ldap_user_dn }}"
+  
+          DISPATCH_ACCESS_TOKEN: "{{ event_dispatcher_pass }}"
+          SETTINGS_ACCESS_TOKEN: "{{ notification_settings_access_token }}"
+  
+  event-dispatcher-worker:
+      image: harbor-registry.atlantishq.de/atlantishq/event-dispatcher-worker
+  
+      restart: always
+      environment:
+  
+          DISPATCH_SERVER: "{{ event_dispatcher_proto }}://{{ event_dispatcher_host }}"
+          DISPATCH_ACCESS_TOKEN: "{{ event_dispatcher_pass }}"
+  
+          NTFY_PUSH_TARGET: "{{ ntfy_push_target }}"
+          NTFY_USER: "admin"
+          NTFY_PASS: "{{ ntfy_api_access_token }}"
+          NTFY_API_SERVER: "{{ ntfy_api_target }}"
+          NTFY_API_TOKEN: "{{ ntfy_api_access_token }}"
+  
+          LDAP_SERVER : "{{ ldap_connection_url }}"
+          LDAP_BIND_DN : "{{ ldap_bind_dn }}"
+          LDAP_BIND_PW : "{{ ldap_password }}"
+          LDAP_BASE_DN : "{{ ldap_user_dn }}"
+  
+          SMTP_TARGET: "{{ smtp_internal_host }}"
+          SMTP_PORT: "{{ smtp_internal_host_port }}"
+          SMTP_USER: "{{ smtp_service_user }}@atlantishq.de"
+          SMTP_PASS: "{{ smtp_service_pass }}"
diff --git a/roles/docker-deployments/templates/grafana.yaml b/roles/docker-deployments/templates/grafana.yaml
index 8842529..a7e41bd 100644
--- a/roles/docker-deployments/templates/grafana.yaml
+++ b/roles/docker-deployments/templates/grafana.yaml
@@ -1,4 +1,5 @@
-grafana:
+services:
+ grafana:
     ports:
         - 4000:3000
     image: grafana/grafana-oss
diff --git a/roles/docker-deployments/templates/hedgedoc.yaml b/roles/docker-deployments/templates/hedgedoc.yaml
index 8d9c504..64118f7 100644
--- a/roles/docker-deployments/templates/hedgedoc.yaml
+++ b/roles/docker-deployments/templates/hedgedoc.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   database:
     image: postgres:13.4-alpine
diff --git a/roles/docker-deployments/templates/money-balancer.yaml b/roles/docker-deployments/templates/money-balancer.yaml
index d225cab..5d6510f 100644
--- a/roles/docker-deployments/templates/money-balancer.yaml
+++ b/roles/docker-deployments/templates/money-balancer.yaml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   money-balancer:
     image: ghcr.io/dorianim/money-balancer
diff --git a/roles/docker-deployments/templates/ntfy.yaml b/roles/docker-deployments/templates/ntfy.yaml
index 70b7461..f925668 100644
--- a/roles/docker-deployments/templates/ntfy.yaml
+++ b/roles/docker-deployments/templates/ntfy.yaml
@@ -1,5 +1,3 @@
-version: "2.3"
-
 services:
   ntfy:
     image: binwiederhier/ntfy
diff --git a/roles/docker-deployments/templates/potaris.yaml b/roles/docker-deployments/templates/potaris.yaml
index e955e5a..ac2e416 100644
--- a/roles/docker-deployments/templates/potaris.yaml
+++ b/roles/docker-deployments/templates/potaris.yaml
@@ -1,4 +1,5 @@
-potaris:
+services:
+  potaris:
     ports:
         - 5003:5000
         - 5004:5000
diff --git a/roles/docker-deployments/templates/python-flask-picture-factory.yaml b/roles/docker-deployments/templates/python-flask-picture-factory.yaml
index 105dadc..e7c5d55 100644
--- a/roles/docker-deployments/templates/python-flask-picture-factory.yaml
+++ b/roles/docker-deployments/templates/python-flask-picture-factory.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   image-factory:
     image: harbor-registry.atlantishq.de/atlantishq/atlantis-image-factory:latest
diff --git a/roles/docker-deployments/templates/sector32.yaml b/roles/docker-deployments/templates/sector32.yaml
index 08e68c6..9f89ed8 100644
--- a/roles/docker-deployments/templates/sector32.yaml
+++ b/roles/docker-deployments/templates/sector32.yaml
@@ -1,5 +1,6 @@
-sector32:
+services:
+  sector32:
     ports:
         - 5001:5000
-    image: registry.atlantishq.de/athq/sector32
+    image: harbor-registry.atlantishq.de/atlantishq/sector32
     restart: always
diff --git a/roles/docker-deployments/templates/soundlib-interface.yaml b/roles/docker-deployments/templates/soundlib-interface.yaml
index 3886582..9248b2a 100644
--- a/roles/docker-deployments/templates/soundlib-interface.yaml
+++ b/roles/docker-deployments/templates/soundlib-interface.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   soundlib:
     image: harbor-registry.atlantishq.de/atlantishq/atlantis-soundlib:latest
diff --git a/roles/docker-deployments/templates/tmnf-replay-server.yaml b/roles/docker-deployments/templates/tmnf-replay-server.yaml
index cc95f7c..9e3ddf4 100644
--- a/roles/docker-deployments/templates/tmnf-replay-server.yaml
+++ b/roles/docker-deployments/templates/tmnf-replay-server.yaml
@@ -1,4 +1,5 @@
-tmnf-replay-server:
+services:
+  tmnf-replay-server:
     image: harbor-registry.atlantishq.de/atlantishq/tmnf-replay-server:latest
     restart: always
     ports: