diff --git a/tasks/keystone_ldap_setup.yml b/tasks/keystone_ldap_setup.yml
index e25a4b53..4b7dcd88 100644
--- a/tasks/keystone_ldap_setup.yml
+++ b/tasks/keystone_ldap_setup.yml
@@ -25,7 +25,8 @@
     insecure: "{{ keystone_service_adminuri_insecure }}"
   with_dict: "{{ keystone_ldap }}"
   no_log: true
-  run_once: true
+  when:
+    - inventory_hostname == ((groups['keystone_all'] | intersect(ansible_play_hosts)) | list)[-1]
 
 - name: Create Keystone LDAP domain configs
   template:
diff --git a/tasks/main.yml b/tasks/main.yml
index 80fe6cbc..362ad649 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -129,7 +129,6 @@
 - include: keystone_ldap_setup.yml
   static: no
   when:
-    - inventory_hostname == ((groups['keystone_all'] | intersect(ansible_play_hosts)) | list)[-1]
     - keystone_service_setup | bool
   tags:
     - keystone-config