diff --git a/ansible/roles/grafana/tasks/deploy.yml b/ansible/roles/grafana/tasks/deploy.yml
index c12e50dcef98541ae210381dc6b2be1e2737c3dd..8dee54b5a90a16607b59fffb7be497c2378c7540 100644
--- a/ansible/roles/grafana/tasks/deploy.yml
+++ b/ansible/roles/grafana/tasks/deploy.yml
@@ -1,12 +1,9 @@
 ---
 - include: config.yml
-  when: inventory_hostname in groups['grafana']
 
 - include: bootstrap.yml
-  when: inventory_hostname in groups['grafana']
 
 - name: Flush handlers
   meta: flush_handlers
 
 - include: post_config.yml
-  when: inventory_hostname in groups['grafana']
diff --git a/ansible/roles/keystone/tasks/deploy.yml b/ansible/roles/keystone/tasks/deploy.yml
index 95151c5dde4c0dc763204417a51c9d338b015650..a730c46f35cf99ba34203c85c8e0d9b2217ab649 100644
--- a/ansible/roles/keystone/tasks/deploy.yml
+++ b/ansible/roles/keystone/tasks/deploy.yml
@@ -1,19 +1,15 @@
 ---
 - include: config.yml
-  when: inventory_hostname in groups['keystone']
 
 - include: bootstrap.yml
-  when: inventory_hostname in groups['keystone']
 
 - name: Flush handlers
   meta: flush_handlers
 
 - include: init_fernet.yml
   when:
-    - inventory_hostname in groups['keystone']
     - keystone_token_provider == 'fernet'
 
 - include: register.yml
-  when: inventory_hostname in groups['keystone']
 
 - include: check.yml
diff --git a/ansible/roles/mongodb/tasks/deploy.yml b/ansible/roles/mongodb/tasks/deploy.yml
index fd4ed25937302d208e1f0a5301bf5db9f17f8891..98daa4021c80fe45b12c732676e385a820c53f78 100644
--- a/ansible/roles/mongodb/tasks/deploy.yml
+++ b/ansible/roles/mongodb/tasks/deploy.yml
@@ -1,9 +1,6 @@
 ---
 - include: config.yml
-  when: inventory_hostname in groups['mongodb']
 
 - include: bootstrap.yml
-  when: inventory_hostname in groups['mongodb']
 
 - include: start.yml
-  when: inventory_hostname in groups['mongodb']
diff --git a/ansible/roles/panko/tasks/deploy.yml b/ansible/roles/panko/tasks/deploy.yml
index 933bd9459dc9d07f2fab8021671b14f169c64f20..864362ba5fb8a070250fd176c3f2802c9681b837 100644
--- a/ansible/roles/panko/tasks/deploy.yml
+++ b/ansible/roles/panko/tasks/deploy.yml
@@ -1,12 +1,9 @@
 ---
 - include: register.yml
-  when: inventory_hostname in groups['panko-api']
 
 - include: config.yml
-  when: inventory_hostname in groups['panko-api']
 
 - include: bootstrap.yml
-  when: inventory_hostname in groups['panko-api']
 
 - name: Flush handlers
   meta: flush_handlers
diff --git a/ansible/roles/searchlight/tasks/deploy.yml b/ansible/roles/searchlight/tasks/deploy.yml
index 6c0058ec8803103dd2bfd583aa5f247d599d219a..864362ba5fb8a070250fd176c3f2802c9681b837 100644
--- a/ansible/roles/searchlight/tasks/deploy.yml
+++ b/ansible/roles/searchlight/tasks/deploy.yml
@@ -1,12 +1,9 @@
 ---
 - include: register.yml
-  when: inventory_hostname in groups['searchlight']
 
 - include: config.yml
-  when: inventory_hostname in groups['searchlight']
 
 - include: bootstrap.yml
-  when: inventory_hostname in groups['searchlight']
 
 - name: Flush handlers
   meta: flush_handlers