diff --git a/roles/repo_samba4/tasks/main.yml b/roles/repo_samba4/tasks/main.yml
index 52d261a..c4daa1d 100644
--- a/roles/repo_samba4/tasks/main.yml
+++ b/roles/repo_samba4/tasks/main.yml
@@ -13,5 +13,5 @@
     description: Samba4 repo from TranquiIT
     baseurl: http://samba.tranquil.it/centos$releasever/{{ samba_major_version }}/
     gpgcheck: True
-    gpgkey: https://samba.tranquil.it/RPM-GPG-KEY-TISSAMBA-7
+    gpgkey: https://samba.tranquil.it/RPM-GPG-KEY-TISSAMBA-{{ ansible_distribution_major_version }}
   tags: repo,samba
diff --git a/roles/samba/tasks/install.yml b/roles/samba/tasks/install.yml
index 7d70759..56b5d5b 100644
--- a/roles/samba/tasks/install.yml
+++ b/roles/samba/tasks/install.yml
@@ -9,6 +9,11 @@
   when: samba_role == 'dc' or samba_role == 'rodc'
   tags: samba
 
+- name: Update ldb
+  yum: name=ldb-tools state=latest
+  when: samba_role == 'dc' or samba_role == 'rodc'
+  tags: samba
+
   # sssd-libwbclient breaks DC so only install on members
 - name: Install members components
   yum: name=sssd-libwbclient
@@ -54,6 +59,8 @@
     - samba_role == 'dc'
     - not samba_dc_sysvol.stat.exists
   register: samba_dc_join
+  environment:
+    LDB_MODULES_PATH: /usr/lib64/samba/ldb
   ignore_errors: True
   tags: samba
 
@@ -79,6 +86,8 @@
     - not samba_dc_sysvol.stat.exists
     - samba_i_am_primary_dc == True
     - samba_dc_join.rc != 0
+  environment:
+    LDB_MODULES_PATH: /usr/lib64/samba/ldb
   tags: samba
 
 - name: Join the domain (as RODC)
@@ -92,5 +101,7 @@
   when:
     - samba_role == 'rodc'
     - not samba_dc_sysvol.stat.exists
+  environment:
+    LDB_MODULES_PATH: /usr/lib64/samba/ldb
   tags: samba