diff --git a/ceph-upgrade.groovy b/ceph-upgrade.groovy
index a0d6a1f..d323f1d 100644
--- a/ceph-upgrade.groovy
+++ b/ceph-upgrade.groovy
@@ -26,6 +26,7 @@
 salt = new com.mirantis.mk.Salt()
 def python = new com.mirantis.mk.Python()
 ceph = new com.mirantis.mk.Ceph()
+upgradeChecks = new com.mirantis.mcp.UpgradeChecks()
 askConfirmation = (env.getProperty('ASK_CONFIRMATION') ?: true).toBoolean()
 
 pepperEnv = "pepperEnv"
@@ -191,6 +192,10 @@
             }
         }
 
+        stage('Pre-validate cluster model settings'){
+            upgradeChecks.check_36461_2(salt, pepperEnv, "", true)
+        }
+
         if (BACKUP_ENABLED.toBoolean() == true) {
             if (STAGE_UPGRADE_MON.toBoolean() == true) {
                 backup(pepperEnv, 'mon')
@@ -259,5 +264,12 @@
         if (WAIT_FOR_HEALTHY.toBoolean()) {
             ceph.waitForHealthy(pepperEnv, flags)
         }
+        stage('Post-upgrade cluster model settings validation'){
+            def checkResult = upgradeChecks.check_36461_2(salt, pepperEnv, "", false)
+            common.warningMsg(checkResult.isFixed)
+            if ( checkResult.waInfo != '') {
+                common.warningMsg(checkResult.waInfo)
+            }
+        }
     }
 }
diff --git a/pre-upgrade-verify.groovy b/pre-upgrade-verify.groovy
index d4e8e3b..acd591f 100644
--- a/pre-upgrade-verify.groovy
+++ b/pre-upgrade-verify.groovy
@@ -5,7 +5,7 @@
 upgradeChecks = new com.mirantis.mcp.UpgradeChecks()
 
 reportDir = 'reportDir/'
-waList =['check_34406', 'check_34645', 'check_35705', 'check_35884', 'check_36461', 'check_36461_2']
+waList =['check_34406', 'check_34645', 'check_35705', 'check_35884', 'check_36461', 'check_36461_2', 'check_36960']
 
 timeout(time: PIPELINE_TIMEOUT, unit: 'HOURS') {
     node('python') {
@@ -39,7 +39,7 @@
       <tr>
         <th class='row'>Prod id</th>
         <th class='row'>Status</th>
-        <th class='row'>Doc link</th>
+        <th class='row'>Comment</th>
       </tr>"""
                 def reportTail = """
     </table>
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 7c1ed32..23ce0ef 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -658,6 +658,7 @@
                 upgradeChecks.check_35884(salt, venvPepper, cluster_name, true)
                 upgradeChecks.check_36461(salt, venvPepper, cluster_name, true)
                 upgradeChecks.check_36461_2(salt, venvPepper, cluster_name, true)
+                upgradeChecks.check_36960(salt, venvPepper, cluster_name, true)
 
                 common.infoMsg('Perform: Validate reclass medata before processing')
                 validateReclassModel(minions, 'before')