diff --git a/docker-compose.duckdns.yml b/docker-compose.duckdns.yml
new file mode 100644
index 00000000..7673f153
--- /dev/null
+++ b/docker-compose.duckdns.yml
@@ -0,0 +1,27 @@
+version: '3.8'
+
+services:
+  duckdns:
+    image: lscr.io/linuxserver/duckdns:latest
+    container_name: duckdns
+    environment:
+      PUID: "1000"
+      PGID: "1000"
+      TZ: "Europe/Berlin"
+      SUBDOMAINS: "${DUCKDNS_SUBDOMAINS}"
+      TOKEN: "${DUCKDNS_TOKEN}"
+    restart: unless-stopped
+
+  dns-monitor:
+    image: alpine
+    container_name: dns-monitor
+    dns:
+      - 8.8.8.8
+      - 1.1.1.1
+    environment:
+      SUBDOMAINS: "${DUCKDNS_SUBDOMAINS}"
+      TZ: "Europe/Berlin"
+    volumes:
+      - ./dns-monitor:/app
+    command: "/app/monitor.sh"
+    restart: unless-stopped
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 65aef1a0..ae83a847 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -254,30 +254,7 @@ services:
       - lead_engine_data:/app/data
 
   # --- INFRASTRUCTURE SERVICES ---
-  duckdns:
-    image: lscr.io/linuxserver/duckdns:latest
-    container_name: duckdns
-    environment:
-      PUID: "1000"
-      PGID: "1000"
-      TZ: "Europe/Berlin"
-      SUBDOMAINS: "${DUCKDNS_SUBDOMAINS}"
-      TOKEN: "${DUCKDNS_TOKEN}"
-    restart: unless-stopped
 
-  dns-monitor:
-    image: alpine
-    container_name: dns-monitor
-    dns:
-      - 8.8.8.8
-      - 1.1.1.1
-    environment:
-      SUBDOMAINS: "${DUCKDNS_SUBDOMAINS}"
-      TZ: "Europe/Berlin"
-    volumes:
-      - ./dns-monitor:/app
-    command: "/app/monitor.sh"
-    restart: unless-stopped
 
 volumes:
   connector_db_data: {}