diff --git a/mailu/Chart.yaml b/mailu/Chart.yaml
index e255230f9ab242da25e1d323b6e6d0adf69fc48a..f68ddefa63c5fda948ee3fc300ccc4af72cc8837 100644
--- a/mailu/Chart.yaml
+++ b/mailu/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: mailu
 description: Helm Chart for Mailu
 type: application
-version: 1.3.5
+version: 1.3.6
 appVersion: "1.9.26"
diff --git a/mailu/templates/configmap-autodiscover.yaml b/mailu/templates/configmap-autodiscover.yaml
index 64e70a210bd474787b31ca4809568a9fa5ee2df9..3f4d1a097329082e17b61bb8e80923d7023ac0cb 100644
--- a/mailu/templates/configmap-autodiscover.yaml
+++ b/mailu/templates/configmap-autodiscover.yaml
@@ -80,4 +80,4 @@ data:
     {{ range .Values.config.hostnames -}}
     mx: {{ . }}
     {{ end -}}
-    max_age: 604800
+    max_age: 1209600
diff --git a/mailu/templates/ingress-autodiscover.yaml b/mailu/templates/ingress-autodiscover.yaml
index 3aca552ca9679eba1dc3e1292681aaab10480fd6..1b4d7b964dafa4fca5152c8854837ae32f3c5ed0 100644
--- a/mailu/templates/ingress-autodiscover.yaml
+++ b/mailu/templates/ingress-autodiscover.yaml
@@ -42,8 +42,7 @@ spec:
                 port:
                   name: http
             pathType: Prefix
-    {{ end }}
-    - host: mta-sts.{{ .Values.config.domain }}
+    - host: "mta-sts.{{ . }}"
       http:
         paths:
           - path: "/.well-known/mta-sts.txt"
@@ -53,6 +52,7 @@ spec:
                 port:
                   name: http
             pathType: Prefix
+    {{ end }}
     - host: "autodiscover.{{ .Values.config.domain }}"
       http:
         paths: