diff --git a/roles/mail/templates/dovecot/local.conf.j2 b/roles/mail/templates/dovecot/local.conf.j2
index e4a0b36..d7e09b1 100644
--- a/roles/mail/templates/dovecot/local.conf.j2
+++ b/roles/mail/templates/dovecot/local.conf.j2
@@ -97,6 +97,6 @@ namespace inbox {
   }
   mailbox "Sent Messages" {
     special_use = \Sent
-  }	
+  }
 }
 
diff --git a/roles/mail/templates/postfix/ldap-aliases.cf.j2 b/roles/mail/templates/postfix/ldap-aliases.cf.j2
index 430550e..9c9120c 100644
--- a/roles/mail/templates/postfix/ldap-aliases.cf.j2
+++ b/roles/mail/templates/postfix/ldap-aliases.cf.j2
@@ -1,6 +1,6 @@
 server_host = {{ ldap_host }}
 start_tls = yes
-#tls_ca_cert_file = 
+#tls_ca_cert_file = TODO
 #tls_require_cert = yes
 bind = yes
 bind_dn = {{ ldap_binddn }}
diff --git a/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2 b/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2
index f6272a2..d6f46a1 100644
--- a/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2
+++ b/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2
@@ -1,13 +1,13 @@
 server_host = {{ ldap_host }}
 start_tls = yes
-#tls_ca_cert_file = 
+#tls_ca_cert_file = TODO
 #tls_require_cert = yes
 bind = yes
 bind_dn = {{ ldap_binddn }}
 bind_pw = {{ ldap_bindpw }}
 version = 3
 
-search_base = dc=binary-kitchen,dc=de
+search_base = {{ ldap_base }}
 query_filter = (&(objectClass=mailUser)(mail=%s))
 result_attribute = uid
 result_format = %u/.maildir/
diff --git a/roles/mail/templates/postfix/main.cf.j2 b/roles/mail/templates/postfix/main.cf.j2
index 91e24cf..9311c3e 100644
--- a/roles/mail/templates/postfix/main.cf.j2
+++ b/roles/mail/templates/postfix/main.cf.j2
@@ -21,11 +21,10 @@ inet_interfaces = all
 message_size_limit = 50000000
 recipient_delimiter = +
 
-mydomain = binary-kitchen.com 
-myhostname = ptest.binary-kitchen.com
-myorigin = binary-kitchen.com
-# fixme
-mydestination = ptest.binary.kitchen, localhost.binary.kitchen, localhost
+mydomain = {{ mail_domain }}
+myhostname = {{ ansible_fqdn }}
+myorigin = {{ ansible_fqdn }}
+mydestination = localhost.{{ mail_domain }}, localhost
 mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 
 alias_maps = hash:/etc/aliases
@@ -69,7 +68,7 @@ smtpd_restriction_classes = rbl, rblgrey
 
 rbl = reject_rbl_client sbl.spamhaus.org
       reject_rbl_client cbl.abuseat.org
-      
+
 rblgrey = reject_rbl_client sbl.spamhaus.org
           reject_rbl_client cbl.abuseat.org
           check_policy_service unix:private/spfpolicy
@@ -78,7 +77,7 @@ rblgrey = reject_rbl_client sbl.spamhaus.org
 content_filter = amavis:[127.0.0.1]:10024
 receive_override_options = no_address_mappings
 
-virtual_mailbox_domains = binary-kitchen.com
+virtual_mailbox_domains = {{ mail_domain }}
 virtual_mailbox_maps = hash:/etc/postfix/virtual_mailbox
 virtual_alias_maps = hash:/etc/postfix/virtual_alias
 #virtual_mailbox_maps = ldap:/etc/postfix/ldap-virtual-maps.cf