diff --git a/common/deploy-steps-playbooks-common.yaml b/common/deploy-steps-playbooks-common.yaml
index 84c51c7c58..93bbcbb4e9 100644
--- a/common/deploy-steps-playbooks-common.yaml
+++ b/common/deploy-steps-playbooks-common.yaml
@@ -1,8 +1,8 @@
 - hosts: "{{ deploy_source_host }}"
   name: Gather facts from undercloud
   gather_facts: yes
-  any_errors_fatal: "{{ not ignore_unreachable | default(true) }}"
-  ignore_unreachable: "{{ ignore_unreachable | default(false) }}"
+  any_errors_fatal: "{{ not scale_ignore_unreachable | default(true) }}"
+  ignore_unreachable: "{{ scale_ignore_unreachable | default(false) }}"
   become: false
   tags:
     - facts
@@ -10,16 +10,16 @@
 - hosts: "{{ deploy_target_host }}"
   name: Gather facts from overcloud
   gather_facts: yes
-  any_errors_fatal: "{{ not ignore_unreachable | default(true) }}"
-  ignore_unreachable: "{{ ignore_unreachable | default(false) }}"
+  any_errors_fatal: "{{ not scale_ignore_unreachable | default(true) }}"
+  ignore_unreachable: "{{ scale_ignore_unreachable | default(false) }}"
   tags:
     - facts
 
 - hosts: all
   name: Load global variables
   gather_facts: "{{ gather_facts | default(false) }}"
-  any_errors_fatal: "{{ not ignore_unreachable | default(true) }}"
-  ignore_unreachable: "{{ ignore_unreachable | default(false) }}"
+  any_errors_fatal: "{{ not scale_ignore_unreachable | default(true) }}"
+  ignore_unreachable: "{{ scale_ignore_unreachable | default(false) }}"
   tasks:
     - include_vars: global_vars.yaml
       no_log: true
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index ae6adbed87..9a90ab8d25 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -1157,7 +1157,7 @@ outputs:
               vars:
                 deploy_source_host: "DEPLOY_SOURCE_HOST"
                 deploy_target_host: "DEPLOY_TARGET_HOST"
-                ignore_unreachable: true
+                scale_ignore_unreachable: true
 
             - hosts: DEPLOY_TARGET_HOST
               name: Scaling