diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
index 7ac0756d09..5efcfa1f1a 100644
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
@@ -328,6 +328,7 @@ outputs:
         - name: Create hiera data to upgrade cinder_backup in a stepwise manner.
           when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set cinder_backup upgrade node facts in a single-node environment
               set_fact:
diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
index 339aa68a61..2d664f61b7 100644
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@@ -314,6 +314,7 @@ outputs:
         - name: Create hiera data to upgrade cinder_volume in a stepwise manner.
           when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set cinder_volume upgrade node facts in a single-node environment
               set_fact:
diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml
index 96dc0a498f..ebedba7048 100644
--- a/deployment/database/mysql-pacemaker-puppet.yaml
+++ b/deployment/database/mysql-pacemaker-puppet.yaml
@@ -469,6 +469,7 @@ outputs:
         - name: Create hiera data to upgrade mysql in a stepwise manner.
           when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set mysql upgrade node facts in a single-node environment
               set_fact:
diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml
index 38d4c3a326..4175ef05fa 100644
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@@ -400,8 +400,10 @@ outputs:
                       command: pcs resource bundle update redis-bundle storage-map add id=redis-log source-dir=/var/log/containers/redis target-dir=/var/log/redis options=rw
             - name: Update the redis bundle to use the new container image name
               command: "pcs resource bundle update redis-bundle container image={{redis_image_latest}}"
-        - when:
+        - name: Create hiera data to upgrade redis in a stepwise manner.
+          when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set redis upgrade node facts in a single-node environment
               set_fact:
diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
index 24027cf102..a57f64558f 100644
--- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml
+++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
@@ -521,6 +521,7 @@ outputs:
         - name: Create hiera data to upgrade haproxy in a stepwise manner.
           when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set haproxy upgrade node facts in a single-node environment
               set_fact:
diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml
index 010bdeb138..c444f1863b 100644
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/deployment/manila/manila-share-pacemaker-puppet.yaml
@@ -309,6 +309,7 @@ outputs:
         - name: Create hiera data to upgrade manila_share in a stepwise manner.
           when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set manila_share upgrade node facts in a single-node environment
               set_fact:
diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
index 1beb18a281..de4d61ef0c 100644
--- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
+++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
@@ -417,8 +417,10 @@ outputs:
               register: output
               retries: 5
               until: output.rc == 0
-        - when:
+        - name: Create hiera data to upgrade ovn_dbs in a stepwise manner.
+          when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set ovn_dbs upgrade node facts in a single-node environment
               set_fact:
diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
index c219ce2d61..f860987b00 100644
--- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
@@ -100,7 +100,7 @@ parameters:
   UpgradeLeappEnabled:
     description: Use Leapp for operating system upgrade
     type: boolean
-    default: true
+    default: false
   ContainerCli:
     type: string
     default: 'podman'
@@ -197,18 +197,20 @@ outputs:
       upgrade_tasks:
         - name: upgrade step 0
           when: step|int == 0
-          vars:
-            upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
           block:
+            - name: Set fact upgrade_leapp_enabled
+              set_fact:
+                upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
             - name: Check pacemaker cluster running before upgrade
               tags: validation
               pacemaker_cluster: state=online check_and_fail=true
               async: 30
               poll: 4
               when: not upgrade_leapp_enabled|bool
-        - name: upgrade step 1
+        - name: Create hiera data to upgrade pacemaker in a stepwise manner.
           when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set pacemaker upgrade node facts in a single-node environment
               set_fact:
@@ -275,16 +277,12 @@ outputs:
               when: pacemaker_short_node_names_upgraded | length == pacemaker_short_node_names | length
         - name: upgrade step 2
           when: step|int == 2
-          vars:
-            upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
           block:
             - name: Stop pacemaker cluster
               pacemaker_cluster: state=offline
               when: not upgrade_leapp_enabled
         - name: upgrade step 4
           when: step|int == 4
-          vars:
-            upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
           block:
             - name: Start pacemaker cluster
               pacemaker_cluster: state=online
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
index 2be35135f0..33dea64da5 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@@ -363,6 +363,7 @@ outputs:
         - name: Create hiera data to upgrade oslo messaging notify in a stepwise manner.
           when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set oslo_messaging_notify upgrade node facts in a single-node environment
               set_fact:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
index 983c208a53..b5db7ce103 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@@ -364,6 +364,7 @@ outputs:
         - name: Create hiera data to upgrade rabbitmq in a stepwise manner.
           when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set rabbitmq upgrade node facts in a single-node environment
               set_fact:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
index 78d14701fe..993d59f75c 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@@ -369,6 +369,7 @@ outputs:
         - name: Create hiera data to upgrade oslo messaging rpc in a stepwise manner.
           when:
             - step|int == 1
+            - upgrade_leapp_enabled|bool
           block:
             - name: set oslo_messaging_rpc upgrade node facts in a single-node environment
               set_fact:
diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 8faa41978a..15bfcdc768 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -54,7 +54,7 @@ parameters:
   UpgradeLeappEnabled:
     description: Use Leapp for operating system upgrade
     type: boolean
-    default: true
+    default: false
   UpgradeLeappDebug:
     description: Print debugging output when running Leapp
     type: boolean