diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py
index 78dd4eafd2..20c426209f 100644
--- a/plugins/CuraEngineBackend/StartSliceJob.py
+++ b/plugins/CuraEngineBackend/StartSliceJob.py
@@ -41,39 +41,32 @@ class StartJobResult(IntEnum):
 
 ##  Formatter class that handles token expansion in start/end gcode
 class GcodeStartEndFormatter(Formatter):
-    def get_value(self, key: str, *args: str, **kwargs) -> str: #type: ignore # [CodeStyle: get_value is an overridden function from the Formatter class]
+    def get_value(self, key: str, *args: str, default_extruder_nr: str = "-1", **kwargs) -> str: #type: ignore # [CodeStyle: get_value is an overridden function from the Formatter class]
         # The kwargs dictionary contains a dictionary for each stack (with a string of the extruder_nr as their key),
         # and a default_extruder_nr to use when no extruder_nr is specified
 
-        if isinstance(key, str):
+        extruder_nr = int(default_extruder_nr)
+
+        key_fragments = [fragment.strip() for fragment in key.split(",")]
+        if len(key_fragments) == 2:
             try:
-                extruder_nr = int(kwargs["default_extruder_nr"])
+                extruder_nr = int(key_fragments[1])
             except ValueError:
-                extruder_nr = -1
-
-            key_fragments = [fragment.strip() for fragment in key.split(",")]
-            if len(key_fragments) == 2:
                 try:
-                    extruder_nr = int(key_fragments[1])
-                except ValueError:
-                    try:
-                        extruder_nr = int(kwargs["-1"][key_fragments[1]]) # get extruder_nr values from the global stack
-                    except (KeyError, ValueError):
-                        # either the key does not exist, or the value is not an int
-                        Logger.log("w", "Unable to determine stack nr '%s' for key '%s' in start/end g-code, using global stack", key_fragments[1], key_fragments[0])
-            elif len(key_fragments) != 1:
-                Logger.log("w", "Incorrectly formatted placeholder '%s' in start/end g-code", key)
-                return "{" + str(key) + "}"
-
-            key = key_fragments[0]
-            try:
-                return kwargs[str(extruder_nr)][key]
-            except KeyError:
-                Logger.log("w", "Unable to replace '%s' placeholder in start/end g-code", key)
-                return "{" + key + "}"
-        else:
+                    extruder_nr = int(kwargs["-1"][key_fragments[1]]) # get extruder_nr values from the global stack #TODO: How can you ever provide the '-1' kwarg?
+                except (KeyError, ValueError):
+                    # either the key does not exist, or the value is not an int
+                    Logger.log("w", "Unable to determine stack nr '%s' for key '%s' in start/end g-code, using global stack", key_fragments[1], key_fragments[0])
+        elif len(key_fragments) != 1:
             Logger.log("w", "Incorrectly formatted placeholder '%s' in start/end g-code", key)
-            return "{" + str(key) + "}"
+            return "{" + key + "}"
+
+        key = key_fragments[0]
+        try:
+            return kwargs[str(extruder_nr)][key]
+        except KeyError:
+            Logger.log("w", "Unable to replace '%s' placeholder in start/end g-code", key)
+            return "{" + key + "}"
 
 
 ##  Job class that builds up the message of scene data to send to CuraEngine.
diff --git a/plugins/VersionUpgrade/VersionUpgrade34to40/VersionUpgrade34to40.py b/plugins/VersionUpgrade/VersionUpgrade34to40/VersionUpgrade34to40.py
index 593655a046..2877985921 100644
--- a/plugins/VersionUpgrade/VersionUpgrade34to40/VersionUpgrade34to40.py
+++ b/plugins/VersionUpgrade/VersionUpgrade34to40/VersionUpgrade34to40.py
@@ -6,6 +6,7 @@ import io
 
 from UM.VersionUpgrade import VersionUpgrade
 
+deleted_settings = {"prime_tower_wall_thickness", "dual_pre_wipe", "prime_tower_purge_volume"}
 
 ##  Upgrades configurations from the state they were in at version 3.4 to the
 #   state they should be in at version 4.0.
@@ -68,6 +69,9 @@ class VersionUpgrade34to40(VersionUpgrade):
         parser["metadata"]["setting_version"] = "5"
 
         self._resetConcentric3DInfillPattern(parser)
+        if "values" in parser:
+            for deleted_setting in deleted_settings:
+                del parser["values"][deleted_setting]
 
         result = io.StringIO()
         parser.write(result)
diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json
index 155ce8e962..2e0cd4f839 100644
--- a/resources/definitions/builder_premium_large.def.json
+++ b/resources/definitions/builder_premium_large.def.json
@@ -54,7 +54,6 @@
         "prime_tower_position_y": { "default_value": 178 },
         "prime_tower_wipe_enabled": { "default_value": false },
         "prime_tower_min_volume": { "default_value": 50 },
-        "dual_pre_wipe": { "default_value": false },
 
         "prime_blob_enable": { "enabled": true },
 
diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json
index c390c3719b..58e7c18ed8 100644
--- a/resources/definitions/builder_premium_medium.def.json
+++ b/resources/definitions/builder_premium_medium.def.json
@@ -54,7 +54,6 @@
         "prime_tower_position_y": { "default_value": 178 },
         "prime_tower_wipe_enabled": { "default_value": false },
         "prime_tower_min_volume": { "default_value": 50 },
-        "dual_pre_wipe": { "default_value": false },
 
         "prime_blob_enable": { "enabled": true },
 
diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json
index ec7bf0a345..89e172592c 100644
--- a/resources/definitions/builder_premium_small.def.json
+++ b/resources/definitions/builder_premium_small.def.json
@@ -53,7 +53,6 @@
         "prime_tower_position_y": { "default_value": 178 },
         "prime_tower_wipe_enabled": { "default_value": false },
         "prime_tower_min_volume": { "default_value": 50 },
-        "dual_pre_wipe": { "default_value": false },
 
         "prime_blob_enable": { "enabled": true },
 
diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json
index d2b7242d8c..04279ce392 100644
--- a/resources/definitions/cartesio.def.json
+++ b/resources/definitions/cartesio.def.json
@@ -44,7 +44,7 @@
         "material_print_temp_wait": { "default_value": false },
         "material_bed_temp_wait": { "default_value": false },
         "prime_tower_enable": { "default_value": false },
-        "prime_tower_wall_thickness": { "resolve": 0.7 },
+        "prime_tower_min_volume": { "value": "0.7" },
         "prime_tower_size": { "value": 24.0 },
         "prime_tower_position_x": { "value": 125 },
         "prime_tower_position_y": { "value": 70 },
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index b458316686..d96aeaa52a 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -4992,32 +4992,12 @@
                     "description": "The minimum volume for each layer of the prime tower in order to purge enough material.",
                     "unit": "mm³",
                     "type": "float",
-                    "default_value": 10,
-                    "value": "8.48 if prime_tower_circular else 10",
+                    "default_value": 5,
                     "minimum_value": "0",
-                    "maximum_value_warning": "round((resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height'), 2) if prime_tower_circular else resolveOrValue('prime_tower_size') ** 2 * resolveOrValue('layer_height')",
+                    "maximum_value_warning": "((resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height') if prime_tower_circular else resolveOrValue('prime_tower_size') ** 2 * resolveOrValue('layer_height')) - sum(extruderValues('prime_tower_min_volume')) + prime_tower_min_volume",
                     "enabled": "resolveOrValue('prime_tower_enable')",
                     "settable_per_mesh": false,
-                    "settable_per_extruder": true,
-                    "children":
-                    {
-                        "prime_tower_wall_thickness":
-                        {
-                            "label": "Prime Tower Thickness",
-                            "description": "The thickness of the hollow prime tower. A thickness larger than half the Prime Tower Minimum Volume will result in a dense prime tower.",
-                            "unit": "mm",
-                            "type": "float",
-                            "default_value": 2,
-                            "value": "round(max(2 * prime_tower_line_width, (0.5 * (prime_tower_size - math.sqrt(max(0, prime_tower_size ** 2 - 4 * prime_tower_min_volume / (3.14159 * layer_height))))) if prime_tower_circular else (0.5 * (prime_tower_size - math.sqrt(max(0, prime_tower_size ** 2 - prime_tower_min_volume / layer_height))))), 3)",
-                            "resolve": "max(extruderValues('prime_tower_wall_thickness'))",
-                            "minimum_value": "0.001",
-                            "minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width')) - 0.0001",
-                            "maximum_value_warning": "prime_tower_size / 2",
-                            "enabled": "prime_tower_enable",
-                            "settable_per_mesh": false,
-                            "settable_per_extruder": false
-                        }
-                    }
+                    "settable_per_extruder": true
                 },
                 "prime_tower_position_x":
                 {
@@ -5072,29 +5052,6 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
-                "dual_pre_wipe":
-                {
-                    "label": "Wipe Nozzle After Switch",
-                    "description": "After switching extruder, wipe the oozed material off of the nozzle on the first thing printed. This performs a safe slow wipe move at a place where the oozed material causes least harm to the surface quality of your print.",
-                    "type": "bool",
-                    "enabled": "resolveOrValue('prime_tower_enable')",
-                    "default_value": true,
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true
-                },
-                "prime_tower_purge_volume":
-                {
-                    "label": "Prime Tower Purge Volume",
-                    "description": "Amount of filament to be purged when wiping on the prime tower. Purging is useful for compensating the filament lost by oozing during inactivity of the nozzle.",
-                    "type": "float",
-                    "enabled": "resolveOrValue('prime_tower_enable') and dual_pre_wipe",
-                    "unit": "mm³",
-                    "default_value": 0,
-                    "minimum_value": "0",
-                    "maximum_value_warning": "2.5",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true
-                },
                 "ooze_shield_enabled":
                 {
                     "label": "Enable Ooze Shield",
diff --git a/resources/quality/gmax15plus/gmax15plus_pla_dual_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_pla_dual_normal.inst.cfg
index 90a17d5efd..7fd2ab2296 100644
--- a/resources/quality/gmax15plus/gmax15plus_pla_dual_normal.inst.cfg
+++ b/resources/quality/gmax15plus/gmax15plus_pla_dual_normal.inst.cfg
@@ -64,7 +64,7 @@ ooze_shield_enabled = True
 prime_tower_enable = False
 prime_tower_position_x = 350
 prime_tower_position_y = 350
-prime_tower_wall_thickness = 2
+prime_tower_min_volume = 18
 switch_extruder_retraction_amount = 6
 switch_extruder_retraction_speeds = 60
 
diff --git a/resources/quality/gmax15plus/gmax15plus_pla_dual_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_pla_dual_thick.inst.cfg
index a4860def71..30a99ef243 100644
--- a/resources/quality/gmax15plus/gmax15plus_pla_dual_thick.inst.cfg
+++ b/resources/quality/gmax15plus/gmax15plus_pla_dual_thick.inst.cfg
@@ -64,7 +64,7 @@ ooze_shield_enabled = True
 prime_tower_enable = False
 prime_tower_position_x = 350
 prime_tower_position_y = 350
-prime_tower_wall_thickness = 2
+prime_tower_min_volume = 18
 switch_extruder_retraction_amount = 6
 switch_extruder_retraction_speeds = 60
 
diff --git a/resources/quality/gmax15plus/gmax15plus_pla_dual_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_pla_dual_thin.inst.cfg
index 8fe0b07c76..decafac241 100644
--- a/resources/quality/gmax15plus/gmax15plus_pla_dual_thin.inst.cfg
+++ b/resources/quality/gmax15plus/gmax15plus_pla_dual_thin.inst.cfg
@@ -64,7 +64,7 @@ ooze_shield_enabled = True
 prime_tower_enable = False
 prime_tower_position_x = 350
 prime_tower_position_y = 350
-prime_tower_wall_thickness = 2
+prime_tower_min_volume = 18
 switch_extruder_retraction_amount = 6
 switch_extruder_retraction_speeds = 60
 
diff --git a/resources/quality/gmax15plus/gmax15plus_pla_dual_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_pla_dual_very_thick.inst.cfg
index bfa45804d0..a74bdfdd78 100644
--- a/resources/quality/gmax15plus/gmax15plus_pla_dual_very_thick.inst.cfg
+++ b/resources/quality/gmax15plus/gmax15plus_pla_dual_very_thick.inst.cfg
@@ -63,7 +63,7 @@ ooze_shield_enabled = True
 prime_tower_enable = False
 prime_tower_position_x = 350
 prime_tower_position_y = 350
-prime_tower_wall_thickness = 2
+prime_tower_min_volume = 18
 switch_extruder_retraction_amount = 6
 switch_extruder_retraction_speeds = 60
 
diff --git a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg
index be67da4c12..428f5c1101 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg
@@ -15,9 +15,8 @@ variant = AA 0.25
 cool_fan_speed = 40
 infill_overlap = 15
 material_final_print_temperature = =material_print_temperature - 5
-prime_tower_purge_volume = 0.6
 prime_tower_size = 12
-prime_tower_wall_thickness = 0.9
+prime_tower_min_volume = 2
 retraction_prime_speed = 25
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 wall_thickness = 0.92
diff --git a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
index 6ca8bff496..127032e118 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -12,9 +12,8 @@ material = generic_cpe
 variant = AA 0.25
 
 [values]
-prime_tower_purge_volume = 1
 prime_tower_size = 12
-prime_tower_wall_thickness = 0.9
+prime_tower_min_volume = 2
 retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
index ed8055bd18..1891a274c8 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
@@ -16,7 +16,6 @@ material_print_temperature = =default_material_print_temperature + 10
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
-prime_tower_purge_volume = 1
 skin_overlap = 20
 speed_print = 60
 speed_layer_0 = =math.ceil(speed_print * 20 / 60)
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
index 70b679888f..e4cfdb67fc 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
@@ -17,7 +17,6 @@ material_print_temperature = =default_material_print_temperature + 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
-prime_tower_purge_volume = 1
 speed_print = 60
 speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
index 2555193a9e..cec4b950cf 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
@@ -19,7 +19,6 @@ material_print_temperature = =default_material_print_temperature - 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
-prime_tower_purge_volume = 1
 speed_print = 50
 speed_layer_0 = =math.ceil(speed_print * 20 / 50)
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
index 775cac95cf..892083b264 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
@@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
-prime_tower_purge_volume = 1
 speed_print = 55
 speed_layer_0 = =math.ceil(speed_print * 20 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg
index 25e74e0687..170643275c 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg
@@ -17,7 +17,6 @@ line_width = =machine_nozzle_size * 0.875
 material_print_temperature = =default_material_print_temperature + 15
 material_standby_temperature = 100
 prime_tower_enable = True
-prime_tower_purge_volume = 1
 speed_print = 40
 speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
index 5d08b6f430..5b3cb52f18 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -18,7 +18,6 @@ line_width = =machine_nozzle_size * 0.875
 material_print_temperature = =default_material_print_temperature + 20
 material_standby_temperature = 100
 prime_tower_enable = True
-prime_tower_purge_volume = 1
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg
index 3dafde24c1..fff96ba9fc 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg
@@ -18,7 +18,6 @@ line_width = =machine_nozzle_size * 0.875
 material_print_temperature = =default_material_print_temperature + 17
 material_standby_temperature = 100
 prime_tower_enable = True
-prime_tower_purge_volume = 1
 speed_print = 40
 speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
index c2bfc84ea8..19496565bc 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
@@ -29,7 +29,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 10
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
index 7ff5ab264e..aeee3b4e09 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -29,7 +29,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 20
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
index c38980a198..fcd4fcd999 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -29,7 +29,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 15
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
index 79d388d4c3..52fe1cb01d 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -35,7 +35,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 10
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
index a19bc9be91..857ea39491 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -36,7 +36,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 15
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
index dd28610db5..10673c133a 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -35,7 +35,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 20
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg
index 8a2b6e75a5..e58a1bd87d 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg
@@ -15,9 +15,8 @@ variant = AA 0.25
 cool_fan_speed = 40
 infill_overlap = 15
 material_final_print_temperature = =material_print_temperature - 5
-prime_tower_purge_volume = 0.6
 prime_tower_size = 12
-prime_tower_wall_thickness = 0.9
+prime_tower_min_volume = 2
 retraction_prime_speed = 25
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 wall_thickness = 0.92
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
index 91258147fd..1c1833a385 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -13,10 +13,9 @@ variant = AA 0.25
 
 [values]
 prime_tower_size = 12
-prime_tower_wall_thickness = 0.9
+prime_tower_min_volume = 2
 retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
-wall_thickness = 0.92
-prime_tower_purge_volume = 1
+wall_thickness = 0.92
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
index 2bd217676b..c51e5652e1 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
@@ -26,4 +26,3 @@ wall_thickness = 1
 
 infill_pattern = zigzag
 speed_infill = =math.ceil(speed_print * 50 / 60)
-prime_tower_purge_volume = 1
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg
index 53f7a4b9f4..b80d3ccf22 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg
@@ -23,5 +23,4 @@ speed_wall = =math.ceil(speed_print * 40 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
 
 infill_pattern = zigzag
-speed_infill = =math.ceil(speed_print * 50 / 60)
-prime_tower_purge_volume = 1
+speed_infill = =math.ceil(speed_print * 50 / 60)
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg
index 807718c7e8..c90eedaec3 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg
@@ -24,5 +24,4 @@ speed_topbottom = =math.ceil(speed_print * 30 / 50)
 speed_wall = =math.ceil(speed_print * 30 / 50)
 
 infill_pattern = zigzag
-speed_infill = =math.ceil(speed_print * 40 / 50)
-prime_tower_purge_volume = 1
+speed_infill = =math.ceil(speed_print * 40 / 50)
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg
index 3e7db52e6a..e098b0ffb4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg
@@ -22,5 +22,4 @@ speed_topbottom = =math.ceil(speed_print * 30 / 55)
 speed_wall = =math.ceil(speed_print * 30 / 55)
 
 infill_pattern = zigzag
-speed_infill = =math.ceil(speed_print * 45 / 55)
-prime_tower_purge_volume = 1
+speed_infill = =math.ceil(speed_print * 45 / 55)
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg
index b11ecfcad9..532aacabf7 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg
@@ -21,5 +21,4 @@ speed_print = 40
 speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)
 
-jerk_travel = 50
-prime_tower_purge_volume = 1
+jerk_travel = 50
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
index 4cd0fb22d7..55b9ae8315 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -22,5 +22,4 @@ speed_topbottom = =math.ceil(speed_print * 30 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
 
-jerk_travel = 50
-prime_tower_purge_volume = 1
+jerk_travel = 50
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg
index ce851fb467..01761062a4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg
@@ -22,4 +22,3 @@ speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)
 
 jerk_travel = 50
-prime_tower_purge_volume = 1
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
index 7b99a4d6bd..fee58b367d 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
@@ -29,7 +29,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 10
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
index 4a7ec288f5..aaa810e864 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -29,7 +29,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 20
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
index e72e87da92..5b8aa6d2e1 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -28,7 +28,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 15
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
index d097b34a61..889ffaf567 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
@@ -33,7 +33,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 10
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
index 4fc67e68b2..fca907e8fd 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -34,7 +34,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 20
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
index d0ff5ebac5..673d64d432 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -33,7 +33,7 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
+prime_tower_min_volume = 15
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5
diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg
index 4d4129f2cb..43edb13495 100644
--- a/resources/setting_visibility/advanced.cfg
+++ b/resources/setting_visibility/advanced.cfg
@@ -123,7 +123,6 @@ brim_outside_only
 prime_tower_enable
 prime_tower_position_x
 prime_tower_position_y
-prime_tower_purge_volume
 
 [meshfix]
 
diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg
index 5cb8c4fd2b..0f15247eb7 100644
--- a/resources/setting_visibility/expert.cfg
+++ b/resources/setting_visibility/expert.cfg
@@ -291,13 +291,10 @@ prime_tower_enable
 prime_tower_circular
 prime_tower_size
 prime_tower_min_volume
-prime_tower_wall_thickness
 prime_tower_position_x
 prime_tower_position_y
 prime_tower_flow
 prime_tower_wipe_enabled
-dual_pre_wipe
-prime_tower_purge_volume
 ooze_shield_enabled
 ooze_shield_angle
 ooze_shield_dist
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index e49efa7144..9ad4284b40 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -40,8 +40,7 @@ material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = False
-prime_tower_purge_volume = 2
-prime_tower_wall_thickness = 2.2
+prime_tower_min_volume = 20
 prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index 9741ff6aff..f07a4a55f9 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -22,8 +22,7 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-prime_tower_purge_volume = 2
-prime_tower_wall_thickness = 1.5
+prime_tower_min_volume = 15
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index a2aa7cd843..d7a76d538a 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -40,8 +40,7 @@ material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = False
-prime_tower_purge_volume = 2
-prime_tower_wall_thickness = 2.2
+prime_tower_min_volume = 20
 prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
index 89bfdf69b9..6e882cfa04 100644
--- a/resources/variants/ultimaker3_extended_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -22,8 +22,7 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-prime_tower_purge_volume = 2
-prime_tower_wall_thickness = 1.5
+prime_tower_min_volume = 15
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index 16ab998dc3..6b954041ab 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -40,8 +40,7 @@ material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = False
-prime_tower_purge_volume = 2
-prime_tower_wall_thickness = 2.2
+prime_tower_min_volume = 20
 prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
index 473baf2a5c..634920ca65 100644
--- a/resources/variants/ultimaker_s5_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb04.inst.cfg
@@ -22,8 +22,7 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-prime_tower_purge_volume = 2
-prime_tower_wall_thickness = 1.5
+prime_tower_min_volume = 20
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25