diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 36a2767..83f884e 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -25,14 +25,6 @@
 (evo-x2) {
 	reverse_proxy 192.168.1.11:{args[0]}
 }
-# DNS
-(duckdns) {
-	tls {
-		dns duckdns {
-		    api_token 428a1b3b-bc1d-4906-a230-9cd0a72fd06b
-		}
-    }
-}
 
 # Auth
 (auth_quodatum) {
@@ -53,7 +45,9 @@ quodatum.duckdns.org {
 }
 
 *.quodatum.duckdns.org {
-	import duckdns
+	tls {
+        dns duckdns {env.DUCKDNS_TOKEN}
+    }
 #	import auth_quodatum
 
 	@quodatum host about.quodatum.duckdns.org 
@@ -91,20 +85,6 @@ quodatum.duckdns.org {
 		import auth_quodatum
 		import omv 8444
 	}
-
-	@warden host warden.quodatum.duckdns.org:443
-	handle @warden {
-        reverse_proxy /notifications/hub 0.0.0.0:3012
-        reverse_proxy 0.0.0.0:8882 {
-           header_up X-Real-IP {remote_host}
-        }
-	}
-	
-	@nextcloud host nextcloud.quodatum.duckdns.org
-	handle @nextcloud {
-		import auth_quodatum
-		import omv 8090
-	}
 	
 	@code-bmy host code-bmy.quodatum.duckdns.org
     handle @code-bmy {
@@ -142,7 +122,9 @@ orlop.duckdns.org {
 }
 
 *.orlop.duckdns.org {
-   import duckdns
+  tls {
+        dns duckdns {env.DUCKDNS_TOKEN}
+    }
 #  import auth
    
     @orlop host about.orlop.duckdns.org 
@@ -204,8 +186,3 @@ xu4.lan {
     root * links
     file_server browse
 }
-warden.lan:443 {
-	tls "bunce.andy@gmail.com"
-	reverse_proxy 0.0.0.0:8882
-    reverse_proxy /notifications/hub 0.0.0.0:3012
-}
\ No newline at end of file
diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml
index a294056..eead77a 100644
--- a/caddy/docker-compose.yml
+++ b/caddy/docker-compose.yml
@@ -13,7 +13,15 @@ services:
       - ./site:/srv
       - caddy_data:/data
       - caddy_config:/config
-
+    environment:
+      - DUCKDNS_TOKEN=428a1b3b-bc1d-4906-a230-9cd0a72fd06b
+    dns:
+      - 100.100.100.100  # Tailscale MagicDNS
+      - 8.8.8.8          # Google DNS fallback
+      - 1.1.1.1          # Cloudflare fallback
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+     
 volumes:
   caddy_data:
   caddy_config:
\ No newline at end of file