diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 38bcbbcf11..66c8c80b58 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -348,8 +348,13 @@ outputs:
           params:
             BOOTSTRAP_SERVER_ID: {get_param: [servers, {{primary_role_name}}, '0']}
           template: |
+            - hosts: undercloud:overcloud
+              name: Gather facts
+              gather_facts: yes
             - hosts: overcloud
               name: Server deployments
+              gather_facts: no
+              any_errors_fatal: yes
               tasks:
 {%- for role in roles %}
                 - include: {{role.name}}/deployments.yaml
@@ -360,6 +365,8 @@ outputs:
 {%- endfor %}
             - hosts: overcloud
               name: Deployment steps
+              gather_facts: no
+              any_errors_fatal: yes
               vars:
                 bootstrap_server_id: BOOTSTRAP_SERVER_ID
               tasks:
@@ -370,12 +377,16 @@ outputs:
 {%- for step in range(1,deploy_steps_max) %}
             - hosts: undercloud
               name: Undercloud deployment step {{step}}
+              gather_facts: no
+              any_errors_fatal: yes
               vars:
                 step: '{{step}}'
               tasks:
                 - include: external_deploy_steps_tasks.yaml
             - hosts: overcloud
               name: Overcloud deployment step {{step}}
+              gather_facts: no
+              any_errors_fatal: yes
               vars:
                 bootstrap_server_id: BOOTSTRAP_SERVER_ID
                 step: '{{step}}'
@@ -384,6 +395,8 @@ outputs:
 {%- endfor %}
             - hosts: overcloud
               name: Server Post Deployments
+              gather_facts: no
+              any_errors_fatal: yes
               tasks:
 {%- for role in roles %}
                 - include: {{role.name}}/deployments.yaml