diff --git a/tasks/main.yml b/tasks/main.yml
index 5b593081..b60d6ff7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -49,19 +49,18 @@
     - glance-config
 
 - include: glance_db_setup.yml
-  run_once: true
+  static: no
+  when:
+    - "'glance_api' in group_names"
+    - "inventory_hostname == ansible_play_hosts[0]"
   tags:
     - glance-config
 
 - include: glance_service_setup.yml
-  run_once: true
-  tags:
-    - glance-config
-
-- name: refresh local facts
-  setup:
-    filter: ansible_local
-    gather_subset: "!all"
+  static: no
+  when:
+    - "'glance_api' in group_names"
+    - "inventory_hostname == ansible_play_hosts[0]"
   tags:
     - glance-config