diff --git a/roles/mail_server/templates/dovecot-ldap.conf.ext.j2 b/roles/mail_server/templates/dovecot-ldap.conf.ext.j2
index a92a75f1b9382ffe8b65a0a2501a75cb4ec2a816..bfb29acdaeb1292a354ad74e7c805e4ac899fa38 100644
--- a/roles/mail_server/templates/dovecot-ldap.conf.ext.j2
+++ b/roles/mail_server/templates/dovecot-ldap.conf.ext.j2
@@ -1,16 +1,16 @@
-uris = {{ mail_ldap.url }}
-dn = cn=dovecot,ou=services,{{ mail_ldap.root_dn }}
-dnpass = {{ mail_ldap.dovecot_password }}
+uris = {{ mail_ldap_url }}
+dn = cn=dovecot,ou=services,{{ mail_ldap_root_dn }}
+dnpass = {{ mail_ldap_dovecot_password }}
 tls = yes
-tls_ca_cert_file = {{ mail_ldap.tls_truststore }}
+tls_ca_cert_file = {{ mail_ldap_tls_truststore }}
 tls_require_cert = demand
 auth_bind = yes
-base = ou=people,{{ mail_ldap.root_dn }}
+base = ou=people,{{ mail_ldap_root_dn }}
 scope = onelevel
-user_filter = (&(objectClass=inetOrgPerson)(mail=%u)(memberOf=cn=mail,ou=groups,{{ mail_ldap.root_dn }}))
+user_filter = (&(objectClass=inetOrgPerson)(mail=%u)(memberOf=cn=mail,ou=groups,{{ mail_ldap_root_dn }}))
 pass_attrs = mail=user,userPassword=password
-pass_filter = (&(objectClass=inetOrgPerson)(mail=%u)(memberOf=cn=mail,ou=groups,{{ mail_ldap.root_dn }}))
+pass_filter = (&(objectClass=inetOrgPerson)(mail=%u)(memberOf=cn=mail,ou=groups,{{ mail_ldap_root_dn }}))
 iterate_attrs = mail=user
-iterate_filter = (memberOf=cn=mail,ou=groups,{{ mail_ldap.root_dn }})
+iterate_filter = (memberOf=cn=mail,ou=groups,{{ mail_ldap_root_dn }})
 default_pass_scheme = SSHA
 user_attrs =