diff --git a/common/deploy-steps-playbooks-common.yaml b/common/deploy-steps-playbooks-common.yaml
index 401308c53a..b09d3b9e9c 100644
--- a/common/deploy-steps-playbooks-common.yaml
+++ b/common/deploy-steps-playbooks-common.yaml
@@ -7,6 +7,8 @@
 
 - hosts: all
   name: Clear cached facts
+  # We don't want to gather facts, just clear them
+  gather_facts: false
   tasks:
     - meta: clear_facts
   tags:
@@ -14,14 +16,8 @@
 
 - hosts: "{{ deploy_source_host }}:{{ deploy_target_host }}"
   name: Gather facts
-  gather_facts: yes
-  # False because https://github.com/ansible/ansible/issues/70663
-  any_errors_fatal: false
-  # If an overcloud node is down, we will let MaxFailPercentage
-  # figuring out if the deployment can continue. For the facts gathering tasks,
-  # we will simply ignore unreachable nodes and errors, and let the
-  # Ansible reports the failure in the next plays.
-  ignore_unreachable: true
+  strategy: tripleo_free
+  gather_facts: true
   tags:
     - facts