diff --git a/roles/kerberos/kdc/tasks/main.yml b/roles/kerberos/kdc/tasks/main.yml
index 9874037..32657e4 100644
--- a/roles/kerberos/kdc/tasks/main.yml
+++ b/roles/kerberos/kdc/tasks/main.yml
@@ -17,8 +17,8 @@
     group: "{{ ansible_wheel }}"
   notify: restart kdc
 
-- name: store ldap auth credentials
-  shell: "( echo '{{ kerberos_kdc_pass }}' ; echo '{{ kerberos_kdc_pass }}' ) | kdb5_ldap_util stashsrvpw uid=krb5kdc,cn={{ kerberos_realm }},ou=System,{{ ldap_basedn }}"
+- name: store kdc and kadmin ldap auth credentials
+  shell: "( echo '{{ kerberos_kdc_pass }}' ; echo '{{ kerberos_kdc_pass }}' ) | kdb5_ldap_util stashsrvpw uid=krb5kdc,cn={{ kerberos_realm }},ou=System,{{ ldap_basedn }} ; ( echo '{{ kerberos_kadmin_pass }}' ; echo '{{ kerberos_kadmin_pass }}' ) | kdb5_ldap_util stashsrvpw uid=krb5kadmin,cn={{ kerberos_realm }},ou=System,{{ ldap_basedn }}"
   args:
     creates: "/var/kerberos/krb5kdc/.k5.ldap.{{ kerberos_realm|lower() }}"
   no_log: true
diff --git a/roles/kerberos/kdc/templates/kdc.conf.j2 b/roles/kerberos/kdc/templates/kdc.conf.j2
index 9f3259b..0a70dce 100644
--- a/roles/kerberos/kdc/templates/kdc.conf.j2
+++ b/roles/kerberos/kdc/templates/kdc.conf.j2
@@ -24,8 +24,8 @@
   ldap.{{ kerberos_realm|lower() }} = {
     db_library = kldap
     ldap_kerberos_container_dn = "ou=System,{{ ldap_basedn }}"
-    ldap_kdc_dn = "uid=krb5kdc,cn=FOO.SH,ou=System,{{ ldap_basedn }}"
-    ldap_kadmind_dn = "uid=krb5kdc,cn=FOO.SH,ou=System,{{ ldap_basedn }}"
+    ldap_kdc_dn = "uid=krb5kdc,cn={{ kerberos_realm }},ou=System,{{ ldap_basedn }}"
+    ldap_kadmind_dn = "uid=krb5kadmin,cn={{ kerberos_realm }},ou=System,{{ ldap_basedn }}"
     ldap_service_password_file = "/var/kerberos/krb5kdc/.k5.ldap.{{ kerberos_realm|lower() }}"
     ldap_servers = "{% for item in ldap_server %}ldaps://{{ item }} {% endfor %}"
   }