diff --git a/package-postfix_access/templates/postfix-ldap/catchall_maps.cf.j2 b/package-postfix_access/templates/postfix-ldap/catchall_maps.cf.j2
index 14d3eca..cb0344a 100644
--- a/package-postfix_access/templates/postfix-ldap/catchall_maps.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/catchall_maps.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = sub
 query_filter    = (&(objectClass=mailUser)(accountStatus=active)(|(mail=@%d)(shadowAddress=@%d)))
diff --git a/package-postfix_access/templates/postfix-ldap/recipient_bcc_maps_domain.cf.j2 b/package-postfix_access/templates/postfix-ldap/recipient_bcc_maps_domain.cf.j2
index 7157f02..0608707 100644
--- a/package-postfix_access/templates/postfix-ldap/recipient_bcc_maps_domain.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/recipient_bcc_maps_domain.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = one
 query_filter    = (&(objectClass=mailDomain)(|(domainName=%d)(domainAliasName=%d))(accountStatus=active)(enabledService=mail)(enabledService=recipientbcc))
diff --git a/package-postfix_access/templates/postfix-ldap/recipient_bcc_maps_user.cf.j2 b/package-postfix_access/templates/postfix-ldap/recipient_bcc_maps_user.cf.j2
index 6008c2f..1117c25 100644
--- a/package-postfix_access/templates/postfix-ldap/recipient_bcc_maps_user.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/recipient_bcc_maps_user.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = ou=Users,domainName=%d,{{ ldap_basedn }}
 scope           = one
 query_filter    = (&(|(mail=%s)(&(enabledService=shadowaddress)(shadowAddress=%s)))(objectClass=mailUser)(accountStatus=active)(enabledService=mail)(enabledService=recipientbcc))
diff --git a/package-postfix_access/templates/postfix-ldap/relay_domains.cf.j2 b/package-postfix_access/templates/postfix-ldap/relay_domains.cf.j2
index 4d23609..646c6bc 100644
--- a/package-postfix_access/templates/postfix-ldap/relay_domains.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/relay_domains.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 bind            = yes
 start_tls       = no
 version         = 3
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = one
 query_filter    = (&(objectClass=mailDomain)(|(domainName=%s)(&(enabledService=domainalias)(domainAliasName=%s)))(domainBackupMX=yes)(accountStatus=active)(enabledService=mail))
diff --git a/package-postfix_access/templates/postfix-ldap/sender_bcc_maps_domain.cf.j2 b/package-postfix_access/templates/postfix-ldap/sender_bcc_maps_domain.cf.j2
index d3eace7..fe9821f 100644
--- a/package-postfix_access/templates/postfix-ldap/sender_bcc_maps_domain.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/sender_bcc_maps_domain.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = one
 query_filter    = (&(objectClass=mailDomain)(|(domainName=%d)(domainAliasName=%d))(accountStatus=active)(enabledService=mail)(enabledService=senderbcc))
diff --git a/package-postfix_access/templates/postfix-ldap/sender_bcc_maps_user.cf.j2 b/package-postfix_access/templates/postfix-ldap/sender_bcc_maps_user.cf.j2
index 1a9b1cf..c66ef4e 100644
--- a/package-postfix_access/templates/postfix-ldap/sender_bcc_maps_user.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/sender_bcc_maps_user.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = ou=Users,domainName=%d,{{ ldap_basedn }}
 scope           = one
 query_filter    = (&(|(mail=%s)(&(enabledService=shadowaddress)(shadowAddress=%s)))(objectClass=mailUser)(accountStatus=active)(enabledService=mail)(enabledService=senderbcc))
diff --git a/package-postfix_access/templates/postfix-ldap/sender_login_maps.cf.j2 b/package-postfix_access/templates/postfix-ldap/sender_login_maps.cf.j2
index d479cdd..4dd4be0 100644
--- a/package-postfix_access/templates/postfix-ldap/sender_login_maps.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/sender_login_maps.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = sub
 query_filter    = (&(objectClass=mailUser)(accountStatus=active)(enabledService=mail)(enabledService=smtp)(|(mail=%s)(&(enabledService=shadowaddress)(shadowAddress=%s))))
diff --git a/package-postfix_access/templates/postfix-ldap/transport_maps_domain.cf.j2 b/package-postfix_access/templates/postfix-ldap/transport_maps_domain.cf.j2
index a283c70..4f857e2 100644
--- a/package-postfix_access/templates/postfix-ldap/transport_maps_domain.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/transport_maps_domain.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = one
 query_filter    = (&(objectClass=mailDomain)(accountStatus=active)(enabledService=mail)(|(domainName=%s)(domainAliasName=%s)))
diff --git a/package-postfix_access/templates/postfix-ldap/transport_maps_user.cf.j2 b/package-postfix_access/templates/postfix-ldap/transport_maps_user.cf.j2
index 5147f24..5556adf 100644
--- a/package-postfix_access/templates/postfix-ldap/transport_maps_user.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/transport_maps_user.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = ou=Users,domainName=%d,{{ ldap_basedn }}
 scope           = one
 query_filter    = (&(objectClass=mailUser)(mail=%s)(accountStatus=active)(enabledService=mail))
diff --git a/package-postfix_access/templates/postfix-ldap/virtual_alias_maps.cf.j2 b/package-postfix_access/templates/postfix-ldap/virtual_alias_maps.cf.j2
index 1d8867d..2309322 100644
--- a/package-postfix_access/templates/postfix-ldap/virtual_alias_maps.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/virtual_alias_maps.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = sub
 query_filter    = (&(|(mail=%s)(shadowAddress=%s))(accountStatus=active)(enabledService=mail)(enabledService=deliver)(|(objectClass=mailAlias)(&(objectClass=mailUser)(enabledService=forward))))
diff --git a/package-postfix_access/templates/postfix-ldap/virtual_group_maps.cf.j2 b/package-postfix_access/templates/postfix-ldap/virtual_group_maps.cf.j2
index 009d6fd..e288e27 100644
--- a/package-postfix_access/templates/postfix-ldap/virtual_group_maps.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/virtual_group_maps.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = sub
 query_filter    = (&(accountStatus=active)(enabledService=mail)(enabledService=deliver)(|(&(|(memberOfGroup=%s)(shadowAddress=%s))(objectClass=mailUser))(&(memberOfGroup=%s)(!(shadowAddress=%s))(|(objectClass=mailExternalUser)(objectClass=mailList)(objectClass=mailAlias)))))
diff --git a/package-postfix_access/templates/postfix-ldap/virtual_group_members_maps.cf.j2 b/package-postfix_access/templates/postfix-ldap/virtual_group_members_maps.cf.j2
index da5a6c6..7af7833 100644
--- a/package-postfix_access/templates/postfix-ldap/virtual_group_members_maps.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/virtual_group_members_maps.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = sub
 query_filter    = (&(objectClass=mailUser)(accountStatus=active)(enabledService=mail)(enabledService=deliver)(|(mail=%s)(&(enabledService=shadowaddress)(shadowAddress=%s))))
diff --git a/package-postfix_access/templates/postfix-ldap/virtual_mailbox_domains.cf.j2 b/package-postfix_access/templates/postfix-ldap/virtual_mailbox_domains.cf.j2
index b831c35..56e7f4e 100644
--- a/package-postfix_access/templates/postfix-ldap/virtual_mailbox_domains.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/virtual_mailbox_domains.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 bind            = yes
 start_tls       = no
 version         = 3
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = one
 query_filter    = (&(objectClass=mailDomain)(|(domainName=%s)(&(enabledService=domainalias)(domainAliasName=%s)))(!(domainBackupMX=yes))(accountStatus=active)(enabledService=mail))
diff --git a/package-postfix_access/templates/postfix-ldap/virtual_mailbox_maps.cf.j2 b/package-postfix_access/templates/postfix-ldap/virtual_mailbox_maps.cf.j2
index 442a2f8..2a6d682 100644
--- a/package-postfix_access/templates/postfix-ldap/virtual_mailbox_maps.cf.j2
+++ b/package-postfix_access/templates/postfix-ldap/virtual_mailbox_maps.cf.j2
@@ -4,8 +4,8 @@ server_port     = {{ ldap_port }}
 version         = 3
 bind            = yes
 start_tls       = no
-bind_dn         = {{ username_ldap_admin }}
-bind_pw         = {{ passwd_ldap_admin }}
+bind_dn         = {{ ldap_bind_username }}
+bind_pw         = {{ ldap_bind_password }}
 search_base     = {{ ldap_basedn }}
 scope           = sub
 query_filter    = (&(objectClass=mailUser)(|(mail=%s)(&(enabledService=shadowaddress)(shadowAddress=%s)))(accountStatus=active)(enabledService=mail)(enabledService=deliver))