diff --git a/roles/mail/templates/postfix/ldap-aliases.cf.j2 b/roles/mail/templates/postfix/ldap-aliases.cf.j2
index 589885d..25fa1ed 100644
--- a/roles/mail/templates/postfix/ldap-aliases.cf.j2
+++ b/roles/mail/templates/postfix/ldap-aliases.cf.j2
@@ -7,5 +7,5 @@ bind_pw = {{ ldap_bindpw }}
 version = 3
 
 search_base = {{ ldap_base }}
-query_filter = (&(objectClass=mailUser)(mailAlternateAddress=%s))
+query_filter = (&(objectClass=kitchenUser)(mailAlternateAddress=%s))
 result_attribute = mail
diff --git a/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2 b/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2
index 0bd9d3a..68812b5 100644
--- a/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2
+++ b/roles/mail/templates/postfix/ldap-virtual-maps.cf.j2
@@ -7,6 +7,6 @@ bind_pw = {{ ldap_bindpw }}
 version = 3
 
 search_base = {{ ldap_base }}
-query_filter = (&(objectClass=mailUser)(mail=%s))
+query_filter = (&(objectClass=kitchenUser)(mail=%s))
 result_attribute = uid
 result_format = %u/.maildir/
diff --git a/roles/mail/templates/postfix/virtual-alias.j2 b/roles/mail/templates/postfix/virtual-alias.j2
index e69de29..6a26231 100644
--- a/roles/mail/templates/postfix/virtual-alias.j2
+++ b/roles/mail/templates/postfix/virtual-alias.j2
@@ -0,0 +1 @@
+amavis@{{ mail_domain }}	root@{{ mail_domain }}
diff --git a/site.yml b/site.yml
index 9121076..212d355 100644
--- a/site.yml
+++ b/site.yml
@@ -6,8 +6,12 @@
   - common
   - ntp
 
-- name: Setup test mail server
-  hosts: mail.binary-kitchen.com
+- name: Setup ldap server
+  hosts: helium.binary-kitchen.net
+  roles:
+  - ldap-server
+
+- name: Setup mail server
+  hosts: lithium.binary-kitchen.net
   roles:
-  - certmgr
   - mail