diff --git a/ansible/roles/haproxy/tasks/main.yml b/ansible/roles/haproxy/tasks/main.yml
index 1f16915ad9..ab9215b168 100755
--- a/ansible/roles/haproxy/tasks/main.yml
+++ b/ansible/roles/haproxy/tasks/main.yml
@@ -1,4 +1,6 @@
 ---
 - include: config.yml
+  when: inventory_hostname in groups['haproxy']
 
 - include: start.yml
+  when: inventory_hostname in groups['haproxy']
diff --git a/ansible/site.yml b/ansible/site.yml
index 6eeafed366..b2aa134c92 100755
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: haproxy
+- hosts: [haproxy, mariadb, rabbitmq, cinder-api, glance-api, keystone, nova-api, neutron-server, swift-proxy-server]
   roles:
     - { role: haproxy, tags: haproxy, keepalived, when: enable_haproxy | bool }