diff --git a/tasks/keystone_ldap_setup.yml b/tasks/keystone_ldap_setup.yml
index f24504e6..c98e25de 100644
--- a/tasks/keystone_ldap_setup.yml
+++ b/tasks/keystone_ldap_setup.yml
@@ -24,7 +24,8 @@
     endpoint: "{{ keystone_service_adminurl }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   with_dict: "{{ keystone_ldap }}"
-  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 e2075d19..ffa7ff1a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -132,7 +132,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