diff --git a/plugins/UltimakerMachineActions/UMOUpgradeSelection.py b/plugins/UltimakerMachineActions/UMOUpgradeSelection.py
index aa711e09cf..bcef734f61 100644
--- a/plugins/UltimakerMachineActions/UMOUpgradeSelection.py
+++ b/plugins/UltimakerMachineActions/UMOUpgradeSelection.py
@@ -2,7 +2,6 @@
 # Uranium is released under the terms of the AGPLv3 or higher.
 
 from UM.Settings.ContainerRegistry import ContainerRegistry
-from UM.Settings.InstanceContainer import InstanceContainer
 from cura.MachineAction import MachineAction
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, pyqtProperty
 
@@ -10,8 +9,7 @@ from UM.i18n import i18nCatalog
 from UM.Application import Application
 catalog = i18nCatalog("cura")
 
-import UM.Settings.InstanceContainer
-from cura.CuraApplication import CuraApplication
+from cura.Settings.CuraStackBuilder import CuraStackBuilder
 
 ##  The Ultimaker Original can have a few revisions & upgrades. This action helps with selecting them, so they are added
 #   as a variant.
@@ -38,20 +36,8 @@ class UMOUpgradeSelection(MachineAction):
             # Make sure there is a definition_changes container to store the machine settings
             definition_changes_container = global_container_stack.definitionChanges
             if definition_changes_container == ContainerRegistry.getInstance().getEmptyInstanceContainer():
-                definition_changes_container = self._createDefinitionChangesContainer(global_container_stack)
+                definition_changes_container = CuraStackBuilder.createDefinitionChangesContainer(
+                    global_container_stack, global_container_stack.getId() + "_settings")
 
             definition_changes_container.setProperty("machine_heated_bed", "value", heated_bed)
             self.heatedBedChanged.emit()
-
-    def _createDefinitionChangesContainer(self, global_container_stack):
-        # Create a definition_changes container to store the settings in and add it to the stack
-        definition_changes_container = UM.Settings.InstanceContainer.InstanceContainer(global_container_stack.getName() + "_settings")
-        definition = global_container_stack.getBottom()
-        definition_changes_container.setDefinition(definition)
-        definition_changes_container.addMetaDataEntry("type", "definition_changes")
-        definition_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
-
-        ContainerRegistry.getInstance().addContainer(definition_changes_container)
-        global_container_stack.definitionChanges = definition_changes_container
-
-        return definition_changes_container