diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 0a47469..05f8541 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -4,7 +4,19 @@
     acme_ca https://acme-v02.api.letsencrypt.org/directory
     debug
 }
-import mail_certs
 import email_autodiscover
-
+import mail_certs
+# ---------------------------------------------------------
+# Block A: Die dedizierten Autodiscover Domains
+# ---------------------------------------------------------
+autodiscover.bayarea-cc.com, autodiscover.bizmatch.net,
+autodiscover.ruehrgedoens.de, autoconfig.ruehrgedoens.de,
+autoconfig.bayarea-cc.com, autoconfig.bizmatch.net {
+    
+    # Hier rufen wir das Snippet auf
+    import email_settings
+    
+    # Fallback für Aufrufe auf Root dieser Subdomains
+    respond "Autodiscover Service Online" 200
+}