diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 67c4a32ef8..3e906f717d 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -563,7 +563,18 @@ outputs:
                     tripleo_network_config_async_poll: "{{ async_poll | default(3) }}"
                   when:
                     - NetworkConfig_stat.stat.exists
+              tags:
+                - overcloud
+                - pre_deploy_steps
+{% endraw %}
 
+            - hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
+              strategy: tripleo_free
+              name: Server deployments
+              gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
+              any_errors_fatal: yes
+              tasks:
+{% raw %}
                 - name: Basic Network Validation
                   include_role:
                     name: tripleo_nodes_validation