diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
index cc982f54ca..fd012ac32a 100644
--- a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
+++ b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
@@ -3767,6 +3767,17 @@ class ConductorManager(service.PeriodicService):
             LOG.exception("Invalid ihost_uuid %s" % ihost_uuid)
             return
 
+        try:
+            self.dbapi.software_upgrade_get_one()
+        except exception.NotFound:
+            # No upgrade in progress
+            pass
+        else:
+            if db_host.software_load != tsc.SW_VERSION:
+                LOG.info("Ignore updating disk partition for host: %s. Version "
+                         "%s mismatch." % (db_host.hostname, db_host.software_load))
+                return
+
         # Get the id of the host.
         forihostid = db_host['id']
 
@@ -3958,6 +3969,17 @@ class ConductorManager(service.PeriodicService):
             LOG.exception("Invalid ihost_uuid %s" % ihost_uuid)
             return
 
+        try:
+            self.dbapi.software_upgrade_get_one()
+        except exception.NotFound:
+            # No upgrade in progress
+            pass
+        else:
+            if ihost.software_load != tsc.SW_VERSION:
+                LOG.info("Ignore updating physical volume for host: %s. Version "
+                         "%s mismatch." % (ihost.hostname, ihost.software_load))
+                return
+
         forihostid = ihost['id']
 
         ipvs = self.dbapi.ipv_get_by_ihost(ihost_uuid)