diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 4774a9f62a..b3fda887ab 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -638,9 +638,10 @@ outputs:
               tags:
                 - overcloud
                 - pre_deploy_steps
+{%- for role in roles %}
 
-            - hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
-              name: Host prep steps
+            - hosts: {{role.name}}
+              name: {{role.name}} Host prep steps
               gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
               any_errors_fatal: yes
               vars:
@@ -655,13 +656,11 @@ outputs:
                 docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
                 docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
               tasks:
-{%- for role in roles %}
                 - import_tasks: {{role.name}}/host_prep_tasks.yaml
-                  when: tripleo_role_name == '{{role.name}}'
-{%- endfor %}
               tags:
                 - overcloud
                 - host_prep_steps
+{%- endfor %}
 
 {%- for step in range(1,deploy_steps_max) %}