diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index adc2bd8c07..cf58aad19a 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -417,7 +417,7 @@ outputs:
               tags:
                 - common_roles
 
-            - hosts: overcloud
+            - hosts: {{primary_role_name}}:overcloud
               name: Server deployments
               gather_facts: no
               any_errors_fatal: yes
@@ -433,7 +433,7 @@ outputs:
                 - overcloud
                 - pre_deploy_steps
 
-            - hosts: overcloud
+            - hosts: {{primary_role_name}}:overcloud
               name: Host prep steps
               gather_facts: no
               any_errors_fatal: yes
@@ -464,7 +464,7 @@ outputs:
                 - external
                 - external_deploy_steps
 
-            - hosts: overcloud
+            - hosts: {{primary_role_name}}:overcloud
               name: Overcloud deploy step tasks for {{step}}
               gather_facts: no
               any_errors_fatal: yes
@@ -483,7 +483,7 @@ outputs:
                 - overcloud
                 - deploy_steps
 
-            - hosts: overcloud
+            - hosts: {{primary_role_name}}:overcloud
               name: Overcloud common deploy step tasks {{step}}
               gather_facts: no
               any_errors_fatal: yes
@@ -497,7 +497,7 @@ outputs:
                 - deploy_steps
 
 {%- endfor %}
-            - hosts: overcloud
+            - hosts: {{primary_role_name}}:overcloud
               name: Server Post Deployments
               gather_facts: no
               any_errors_fatal: yes