diff --git a/templates/deploy-autodiscover.yaml b/templates/deploy-autodiscover.yaml
index b252d783d9c8dbc37f865cecb1e9f84897fce078..9bfa810b37979f7370006b295c9ec9bfb5617733 100644
--- a/templates/deploy-autodiscover.yaml
+++ b/templates/deploy-autodiscover.yaml
@@ -31,6 +31,13 @@ spec:
         - name: config
           configMap:
             name: {{ include "mailu-helm.fullname" . }}-autodiscover
+            items:
+              - key: mta-sts.txt
+                path: ".well-known/mta-sts.txt"
+              - key: config-v1.1.xml
+                path: config-v1.1.xml
+              - key: autodiscover.xml
+                path: autodiscover.xml
       containers:
         - name: autodiscover
           securityContext:
diff --git a/templates/ingress-autodiscover.yaml b/templates/ingress-autodiscover.yaml
index a6f4e7bce1d8a1ab7d6b10b8d448b5f1b8c93ad9..b51a5c36e00f569dc8e39243adaf8049b28f809f 100644
--- a/templates/ingress-autodiscover.yaml
+++ b/templates/ingress-autodiscover.yaml
@@ -11,7 +11,6 @@ metadata:
     nginx.ingress.kubernetes.io/cache-whitelist-query-params: ""
     nginx.ingress.kubernetes.io/configuration-snippet: |-
       rewrite ^/.well-known/(carddav|caldav)$ "https://{{ .Values.webdav.host }}{{ .Values.webdav.path }}" permanent;
-      rewrite ^/.well-known/(.*) /$1 last;
       rewrite ^/mail/(.*) /$1 last;
     {{- range $key, $value := .Values.ingress.annotations }}
     {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}