diff --git a/playbooks/roles/kanidm/templates/docker-compose.yml.j2 b/playbooks/roles/kanidm/templates/docker-compose.yml.j2
index b269865..c0c16bc 100644
--- a/playbooks/roles/kanidm/templates/docker-compose.yml.j2
+++ b/playbooks/roles/kanidm/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '3'
 
 services:
   kanidm:
-    image: kanidm/server:1.1.0-rc.16
+    image: kanidm/server:latest
     restart: always
     volumes:
       - ./data:/data
diff --git a/playbooks/roles/mail/templates/docker-compose.yml.j2 b/playbooks/roles/mail/templates/docker-compose.yml.j2
index 8f5d3ab..7f61336 100644
--- a/playbooks/roles/mail/templates/docker-compose.yml.j2
+++ b/playbooks/roles/mail/templates/docker-compose.yml.j2
@@ -25,7 +25,7 @@ services:
 
   mailserver:
     image: ghcr.io/docker-mailserver/docker-mailserver:latest
-    hostname: {{ domain }}
+    hostname: {{ mail_domain }}
     logging:
       driver: "json-file"
       options:
diff --git a/playbooks/roles/mail/templates/dovecot-ldap.conf.j2 b/playbooks/roles/mail/templates/dovecot-ldap.conf.j2
index 92bfcbd..33ea65d 100644
--- a/playbooks/roles/mail/templates/dovecot-ldap.conf.j2
+++ b/playbooks/roles/mail/templates/dovecot-ldap.conf.j2
@@ -3,6 +3,8 @@ uris = {{ ldap_server_host }}
 tls = no
 ldap_version = 3
 default_pass_scheme = SSHA
+dn = {{ ldap_bind_dn }}
+dnpass = {{ email_ldap_api_token }}
 
 auth_bind = yes
 auth_bind_userdn = {{ dovecot_auth_bind_userdn }}