diff --git a/extraconfig/tasks/major_upgrade_ceph_mon.sh b/extraconfig/tasks/major_upgrade_ceph_mon.sh
index e0d160f1ef..a841da1a62 100755
--- a/extraconfig/tasks/major_upgrade_ceph_mon.sh
+++ b/extraconfig/tasks/major_upgrade_ceph_mon.sh
@@ -23,10 +23,9 @@ if [ ${CEPH_STATUS} = HEALTH_ERR ]; then
     exit 1
 fi
 
-# Useful when upgrading with OSDs num < replica size
-if [[ ${ignore_ceph_upgrade_warnings:-False} != [Tt]rue ]]; then
+if [[ ${ignore_ceph_upgrade_warnings:-True} != [Tt]rue ]]; then
     timeout 300 bash -c "while [ ${CEPH_STATUS} != HEALTH_OK ]; do
-      echo WARNING: Waiting for Ceph cluster status to go HEALTH_OK;
+      echo WARNING: Waiting for Ceph cluster health to be HEALTH_OK;
       sleep 30;
       CEPH_STATUS=$(ceph health | awk '{print $1}')
     done"
diff --git a/extraconfig/tasks/major_upgrade_pacemaker.yaml b/extraconfig/tasks/major_upgrade_pacemaker.yaml
index a175a42385..370660f172 100644
--- a/extraconfig/tasks/major_upgrade_pacemaker.yaml
+++ b/extraconfig/tasks/major_upgrade_pacemaker.yaml
@@ -20,7 +20,7 @@ parameters:
     default: 'auto'
   IgnoreCephUpgradeWarnings:
     type: boolean
-    default: false
+    default: true
     description: If enabled, Ceph upgrade will be forced even though cluster or PGs status is not clean
   KeepSaharaServicesOnUpgrade:
     type: boolean