diff --git a/mail/docker-mailserver.yaml b/mail/docker-mailserver.yaml
index 183a00d..9645373 100644
--- a/mail/docker-mailserver.yaml
+++ b/mail/docker-mailserver.yaml
@@ -21,18 +21,35 @@ data:
   LDAP_QUERY_FILTER_DOMAIN: "(mail=*@%s)"
   LDAP_TLS_REQCERT: "never"
 
-  DOVECOT_PASS_FILTER: "(&(objectClass=user)(sAMAccountName=%n))"
-  DOVECOT_USER_FILTER: "(&(objectClass=user)(sAMAccountName=%n))"
+  #DOVECOT_PASS_FILTER: "(&(objectClass=user)(sAMAccountName=%n))"
+  #DOVECOT_USER_FILTER: "(&(objectClass=user)(sAMAccountName=%n))"
+
+  DOVECOT_PASS_FILTER: "(&(objectClass=user)(|(mail=%u)(sAMAccountName=%n)))"
+  DOVECOT_USER_FILTER: "(&(objectClass=user)(|(mail=%u)(sAMAccountName=%n)))"
+
+  #ENABLE_SASLAUTHD: "1"
+  #SASLAUTHD_MECHANISMS: "ldap"
+  #SASLAUTHD_LDAP_SERVER: "ldaps://dc.undercloud.local:636"
+  #SASLAUTHD_LDAP_BIND_DN: "CN=mailserver,OU=serviceaccounts,OU=users,OU=Undercloud,DC=undercloud,DC=local"
+  #SASLAUTHD_LDAP_SEARCH_BASE: "OU=Undercloud,DC=undercloud,DC=local"
+  #SASLAUTHD_LDAP_FILTER: "(&(sAMAccountName=%U)(objectClass=person))"
 
   ENABLE_SASLAUTHD: "1"
-  SASLAUTHD_MECHANISMS: "ldap"
-  SASLAUTHD_LDAP_SERVER: "ldaps://dc.undercloud.local:636"
-  SASLAUTHD_LDAP_BIND_DN: "CN=mailserver,OU=serviceaccounts,OU=users,OU=Undercloud,DC=undercloud,DC=local"
-  SASLAUTHD_LDAP_SEARCH_BASE: "OU=Undercloud,DC=undercloud,DC=local"
-  SASLAUTHD_LDAP_FILTER: "(&(sAMAccountName=%U)(objectClass=person))"
+  SASLAUTHD_MECHANISMS: "rimap"
+  SASLAUTHD_MECH_OPTIONS: "127.0.0.1"
 
   POSTMASTER_ADDRESS: "postmaster@localhost.localdomain"
 ---
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: postfix-main-config
+  namespace: mail
+data:
+  postfix-main.cf: |
+    smtp_address_preference = ipv6
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -192,6 +209,9 @@ spec:
             - name: dovecot-ldap
               mountPath: /etc/dovecot/dovecot-ldap.conf.ext
               subPath: dovecot-ldap.conf.ext
+            - name: postfix-main-config
+              mountPath: /tmp/docker-mailserver/postfix-main.cf
+              subPath: postfix-main.cf
       restartPolicy: Always
       volumes:
         - name: data
@@ -210,6 +230,9 @@ spec:
         - name: dovecot-ldap
           configMap:
             name: dovecot-ldap-config
+        - name: postfix-main-config
+          configMap:
+            name: postfix-main-config
 
 ---
 apiVersion: v1