diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index e2ee266a6b..69b9ec0a5c 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -154,12 +154,17 @@ outputs:
             # but doesn't want to reboot, they can run with
             # `--skip-tags system_upgrade_reboot`.
             - system_upgrade_reboot
-          when: step|int == 4
+          when:
+            - step|int == 4
+            - upgrade_leapp_enabled
           block:
             - name: reboot to perform the upgrade
               reboot:
                 reboot_timeout: "{{upgrade_leapp_reboot_timeout}}"
-              when: upgrade_leapp_enabled
+            - 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