diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 95891bb42c..b732ccf95d 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -940,6 +940,7 @@ outputs:
                 deploy_target_host: "DEPLOY_TARGET_HOST"
 {%- for step in range(0,upgrade_steps_max) %}
             - hosts: DEPLOY_TARGET_HOST
+              strategy: tripleo_free
               name: Upgrade tasks for step {{step}}
               become: true
               gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
@@ -979,6 +980,7 @@ outputs:
                 deploy_source_host: "DEPLOY_SOURCE_HOST"
                 deploy_target_host: "DEPLOY_TARGET_HOST"
             - hosts: DEPLOY_TARGET_HOST
+              strategy: tripleo_free
               any_errors_fatal: yes
               tasks:
                 - include_tasks: post_upgrade_steps_tasks.yaml
@@ -1006,6 +1008,7 @@ outputs:
                 deploy_target_host: "DEPLOY_TARGET_HOST"
 {%- for step in range(external_upgrade_steps_max) %}
             - hosts: DEPLOY_SOURCE_HOST
+              strategy: tripleo_free
               name: External upgrade step {{step}}
               gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
               any_errors_fatal: yes
diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 383a4e1039..777f1f613d 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -206,10 +206,6 @@ outputs:
             - name: reboot to perform the upgrade
               reboot:
                 reboot_timeout: "{{upgrade_leapp_reboot_timeout}}"
-            - name: Clear gathered facts from all currently targeted hosts
-              meta: clear_facts
-            - name: Force facts refresh after OS upgrade to refresh cache.
-              setup:
 
         - name: Package and repo update tasks
           when: step|int == 0