diff --git a/ansible/roles/freezer/tasks/deploy.yml b/ansible/roles/freezer/tasks/deploy.yml
index a57629c2da..c49c38a8f0 100644
--- a/ansible/roles/freezer/tasks/deploy.yml
+++ b/ansible/roles/freezer/tasks/deploy.yml
@@ -1,9 +1,13 @@
 ---
 - include: register.yml
+  when: inventory_hostname in groups['freezer-api']
 
 - include: config.yml
+  when: inventory_hostname in groups['freezer-api'] or
+        inventory_hostname in groups['freezer-scheduler']
 
 - include: bootstrap_service.yml
+  when: inventory_hostname in groups['freezer-api']
 
 - name: Flush handlers
   meta: flush_handlers