diff --git a/controllerconfig/controllerconfig/controllerconfig/upgrades/management.py b/controllerconfig/controllerconfig/controllerconfig/upgrades/management.py
index 8b69d43825..72da7108a6 100644
--- a/controllerconfig/controllerconfig/controllerconfig/upgrades/management.py
+++ b/controllerconfig/controllerconfig/controllerconfig/upgrades/management.py
@@ -307,16 +307,7 @@ def abort_upgrade(from_load, to_load, upgrade):
         except OSError:
             LOG.exception("Failed to remove upgrade directory %s" % directory)
 
-    simplex_backup_filename = get_upgrade_backup_filename(upgrade) + "*"
-    simplex_backup_files = glob.glob(os.path.join(
-        tsc.PLATFORM_BACKUP_PATH, simplex_backup_filename))
-
-    for file in simplex_backup_files:
-        try:
-            LOG.info("Removing simplex upgrade file %s" % file)
-            os.remove(file)
-        except OSError:
-            LOG.exception("Failed to remove %s" % file)
+    remove_simplex_upgrade_data(upgrade)
 
     LOG.info("Finished upgrade abort")
 
@@ -352,7 +343,20 @@ def activate_upgrade(from_load, to_load, i_system):
     LOG.info("Finished upgrade activation")
 
 
-def complete_upgrade(from_load, to_load):
+def remove_simplex_upgrade_data(upgrade):
+    simplex_backup_filename = get_upgrade_backup_filename(upgrade) + "*"
+    simplex_backup_files = glob.glob(os.path.join(
+        tsc.PLATFORM_BACKUP_PATH, simplex_backup_filename))
+
+    for file in simplex_backup_files:
+        try:
+            LOG.info("Removing simplex upgrade file %s" % file)
+            os.remove(file)
+        except OSError:
+            LOG.exception("Failed to remove %s" % file)
+
+
+def complete_upgrade(from_load, to_load, upgrade):
     """ Executed on release N+1, cleans up data created for upgrade. """
     LOG.info("Starting upgrade complete - from: %s, to: %s" %
              (from_load, to_load))
@@ -375,4 +379,6 @@ def complete_upgrade(from_load, to_load):
         except OSError:
             LOG.exception("Failed to remove upgrade directory %s" % directory)
 
+    remove_simplex_upgrade_data(upgrade)
+
     LOG.info("Finished upgrade complete")
diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
index 309225ff66..dec03be6bb 100644
--- a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
+++ b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
@@ -9513,7 +9513,7 @@ class ConductorManager(service.PeriodicService):
             # Complete the upgrade
             LOG.info("Completing upgrade from release: %s to release: %s" %
                      (from_version, to_version))
-            upgrades_management.complete_upgrade(from_version, to_version)
+            upgrades_management.complete_upgrade(from_version, to_version, upgrade)
             LOG.info("Finished completing upgrade")
 
         # Delete upgrade record