diff --git a/templates/deploy-autodiscover.yaml b/templates/deploy-autodiscover.yaml
index 5e268bc83bccf6473d50b76cd7410b888353e482..b252d783d9c8dbc37f865cecb1e9f84897fce078 100644
--- a/templates/deploy-autodiscover.yaml
+++ b/templates/deploy-autodiscover.yaml
@@ -46,8 +46,6 @@ spec:
           volumeMounts:
             - name: config
               mountPath: "/usr/share/nginx/html"
-            - name: config
-              mountPath: "/usr/share/nginx/html/mail"
           startupProbe:
             httpGet:
               path: /config-v1.1.xml
diff --git a/templates/ingress-autodiscover.yaml b/templates/ingress-autodiscover.yaml
index a5df63c16fab3fb16f4448aed75c0dc2e2414699..a6f4e7bce1d8a1ab7d6b10b8d448b5f1b8c93ad9 100644
--- a/templates/ingress-autodiscover.yaml
+++ b/templates/ingress-autodiscover.yaml
@@ -11,6 +11,8 @@ 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 }}
     {{- end }}