diff --git a/roles/kanboard/defaults/main.yml b/roles/kanboard/defaults/main.yml
index 036209e..8cf7f32 100644
--- a/roles/kanboard/defaults/main.yml
+++ b/roles/kanboard/defaults/main.yml
@@ -38,7 +38,7 @@ kanboard_ldap_server: "{{ ad_auth | default(False) | ternary('ldap://' + ad_real
 #kanboard_ldap_bind_user:
 #kanboard_ldap_bind_pass:
 kanboard_ldap_start_tls: True
-kanboard_ldap_user_base: "{{ ad_auth | default(False) | ternary((ad_ldap_user_search_base is defined) | ternary(ad_ldap_user_search_base,'DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC=')), ldap_user_base + ',' + ldap_base) }}"
+kanboard_ldap_user_base: "{{ ad_auth | default(False) | ternary((ad_ldap_user_search_base is defined) | ternary(ad_ldap_user_search_base,'DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC=')), ldap_user_base | default('ou=Users') + ',' + ldap_base | default(ansible_domain | regex_replace('\\.','DC='))) }}"
 kanboard_ldap_user_filter: "{{ ad_auth | default(False) | ternary('(&(objectClass=user)(sAMAccountName=%s))','(&(objectClass=inetOrgPerson)(uid=%s))') }}"
 kanboard_ldap_user_attr_username: "{{ ad_auth | default(False) | ternary('sAMAccountName','uid') }}"
 kanboard_ldap_user_attr_fullname: cn
@@ -46,9 +46,9 @@ kanboard_ldap_user_attr_mail: mail
 kanboard_ldap_user_attr_groups: memberOf
 kanboard_ldap_user_attr_photo: jpegPhoto
 kanboard_ldap_user_attr_lang: preferredLanguagepre
-kanboard_ldap_admin_group: "{{ ad_auth | default(False) | ternary('CN=Domain Admins,CN=Users,DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC='), 'cn=admins,' + ldap_group_base + ',' + ldap_base) }}"
+kanboard_ldap_admin_group: "{{ ad_auth | default(False) | ternary('CN=Domain Admins,CN=Users,DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC='), 'cn=admins,' + ldap_group_base | default('ou=Groups') + ',' + ldap_base | default(ansible_domain | regex_replace('\\.','DC='))) }}"
 kanboard_ldap_manager_group: "{{ kanboard_ldap_admin_group }}"
-kanboard_ldap_group_base: "{{ ad_auth | default(False) | ternary((ad_ldap_group_search_base is defined) | ternary(ad_ldap_group_search_base,'DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC=')), ldap_group_base + ',' + ldap_base) }}"
+kanboard_ldap_group_base: "{{ ad_auth | default(False) | ternary((ad_ldap_group_search_base is defined) | ternary(ad_ldap_group_search_base,'DC=' + ad_realm | default(samba_realm) | default(ansible_domain) | regex_replace('\\.',',DC=')), ldap_group_base | default('ou=Groups') + ',' + ldap_base | default(ansible_domain | regex_replace('\\.','DC='))) }}"
 kanboard_ldap_group_filter: "{{ ad_auth | default(False) | ternary('(&(objectClass=group)(cn=%s))','(&(objectClass=posixGroup)(cn=%s))') }}"
 kanboard_ldap_group_user_filter: "{{ ad_auth | default(False) | ternary('','(&(objectClass=posixGroup)(memberUid=%s))') }}"
 kanboard_ldap_group_attr_name: cn
diff --git a/roles/matrix_element/defaults/main.yml b/roles/matrix_element/defaults/main.yml
index 7f85bb2..6be4090 100644
--- a/roles/matrix_element/defaults/main.yml
+++ b/roles/matrix_element/defaults/main.yml
@@ -5,9 +5,9 @@
 element_id: element
 
 # Version to deploy, and expected sha1
-element_version: 1.9.5
+element_version: 1.9.6
 # sha1sum of the tar.gz
-element_archive_sha1: ca6f65fa29a78bcef905a2aef0616840be32b63f
+element_archive_sha1: 34a0ccd3599c3237f4f604d4e9f91bf123fd014a
 
 # Where to install element
 element_root_dir: /opt/matrix/element