diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
index f860987b00..ca7f311e3b 100644
--- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
@@ -198,9 +198,24 @@ outputs:
         - name: upgrade step 0
           when: step|int == 0
           block:
+            - name: Gather missing facts
+              setup:
+                gather_subset: "distribution"
+              when: >-
+                ansible_facts['distribution'] is not defined or
+                ansible_facts['distribution_major_version'] is not defined
+              tags:
+                - always
             - name: Set fact upgrade_leapp_enabled
               set_fact:
-                upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
+                upgrade_leapp_enabled: >-
+                  {{ _upgradeLeappEnabled | bool and
+                     ansible_facts['distribution'] == 'RedHat' and
+                     ansible_facts['distribution_major_version'] is version('7', '==') }}
+              vars:
+                _upgradeLeappEnabled: {get_param: UpgradeLeappEnabled}
+              tags:
+                - always
             - name: Check pacemaker cluster running before upgrade
               tags: validation
               pacemaker_cluster: state=online check_and_fail=true
diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 759fbb6400..c05c3e6c17 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -111,14 +111,28 @@ outputs:
       step_config: |
         include ::tripleo::packages
       upgrade_tasks:
-        - name: set leapp facts
-          tags: always
+        - name: Gather missing facts
+          setup:
+            gather_subset: "distribution"
+          when: >-
+            ansible_facts['distribution'] is not defined or
+            ansible_facts['distribution_major_version'] is not defined
+          tags:
+            - always
+        - name: Set leapp facts
           set_fact:
-            upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
+            upgrade_leapp_enabled: >-
+              {{ _upgradeLeappEnabled | bool and
+                 ansible_facts['distribution'] == 'RedHat' and
+                 ansible_facts['distribution_major_version'] is version('7', '==') }}
             upgrade_leapp_debug: {get_param: UpgradeLeappDebug}
             upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip}
             upgrade_leapp_command_options: {get_param: UpgradeLeappCommandOptions}
             upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
+          vars:
+            _upgradeLeappEnabled: {get_param: UpgradeLeappEnabled}
+          tags:
+            - always
 
         - name: system_upgrade_prepare step 3
           tags: