diff --git a/caddy/.env.example b/caddy/.env.example
index 4e6c2c7..cb94940 100644
--- a/caddy/.env.example
+++ b/caddy/.env.example
@@ -33,6 +33,8 @@ UPTIME_KUMA_DOMAIN=
 
 ############# Stalwart #############
 STALWART_DOMAIN=
+STALWART_AUTOCONFIG_DOMAIN=
+STALWART_AUTODISCOVER_DOMAIN=
 
 ############# Textarea #############
 TEXTAREA_DOMAIN=
diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index e5c8f4e..d2961fe 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -123,12 +123,16 @@
 }
 
 ############## stalwart ##############
-{$STALWART_DOMAIN} {
+{$STALWART_DOMAIN}, {$STALWART_AUTOCONFIG_DOMAIN}, {$STALWART_AUTODISCOVER_DOMAIN} {
     request_body {
         max_size 4048MB
     }
 
-    reverse_proxy http://stalwart:8080
+    reverse_proxy http://stalwart:8080 {
+        header_up X-Forwarded-Proto {http.request.scheme}
+        header_up X-Forwarded-For {http.request.remote_host}
+        header_up Host {http.request.host}
+    }
 }
 
 ############## textarea ##############