diff --git a/roles/mail_server/templates/dovecot-ldap.conf.ext.j2 b/roles/mail_server/templates/dovecot-ldap.conf.ext.j2
index 269d46843ede181f07c4a9c0cb91fff439e3c961..712727e1b9988ed00d14aff066cf7a93bb776003 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_service_ldap_base_dn }}
+dn = cn=dovecot,ou=services,{{ mail_ldap_base_dn }}
 dnpass = {{ mail_ldap_dovecot_password }}
 tls = yes
 tls_ca_cert_file = {{ mail_ldap_tls_truststore }}
 tls_require_cert = demand
 auth_bind = yes
-base = ou=people,{{ mail_service_ldap_base_dn }}
+base = ou=people,{{ mail_ldap_base_dn }}
 scope = onelevel
-user_filter = (&(objectClass=inetOrgPerson)(mail=%u)(memberOf=cn=mail,ou=groups,{{ mail_service_ldap_base_dn }}))
+user_filter = (&(objectClass=inetOrgPerson)(mail=%u)(memberOf=cn=mail,ou=groups,{{ mail_ldap_base_dn }}))
 pass_attrs = mail=user,userPassword=password
-pass_filter = (&(objectClass=inetOrgPerson)(mail=%u)(memberOf=cn=mail,ou=groups,{{ mail_service_ldap_base_dn }}))
+pass_filter = (&(objectClass=inetOrgPerson)(mail=%u)(memberOf=cn=mail,ou=groups,{{ mail_ldap_base_dn }}))
 iterate_attrs = mail=user
-iterate_filter = (memberOf=cn=mail,ou=groups,{{ mail_service_ldap_base_dn }})
+iterate_filter = (memberOf=cn=mail,ou=groups,{{ mail_ldap_base_dn }})
 default_pass_scheme = SSHA
 user_attrs =