diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index d66536863a..87168d20ae 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -45,6 +45,7 @@
         "gradual_support_infill_step_height": { "value": "4 * layer_height" },
         "gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" },
         "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" },
+        "infill_overlap": { "value": "0 if infill_sparse_density > 80 else 10" },
         "inset_direction": { "value": "'outside_in'" },
         "jerk_infill": { "minimum_value_warning": 20 },
         "jerk_prime_tower": { "minimum_value_warning": 20 },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index b7cf846724..238df96300 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -66,7 +66,6 @@
         "default_material_print_temperature": { "value": "200" },
         "extruder_prime_pos_abs": { "default_value": true },
         "gantry_height": { "value": "55" },
-        "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
         "infill_wipe_dist": { "value": "0" },
         "jerk_enabled": { "value": "True" },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index ebbc6eed64..092a16fa6e 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -65,7 +65,6 @@
         "default_material_print_temperature": { "value": "200" },
         "extruder_prime_pos_abs": { "default_value": true },
         "gantry_height": { "value": "55" },
-        "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
         "infill_wipe_dist": { "value": "0" },
         "jerk_enabled": { "value": "True" },
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg
index ed8b8c2704..6bc57b7a6e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg
@@ -12,6 +12,5 @@ variant = AA 0.25
 weight = 0
 
 [values]
-infill_overlap = =0 if infill_sparse_density > 80 else 15
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg
index 24c0d262c1..95d624cf99 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg
@@ -13,7 +13,6 @@ weight = 0
 
 [values]
 brim_width = 8
-infill_overlap = =0 if infill_sparse_density > 80 else 10
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg
index d73dfaa4b9..90a389ea0b 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg
@@ -13,7 +13,6 @@ weight = 0
 
 [values]
 brim_width = 8
-infill_overlap = =0 if infill_sparse_density > 80 else 10
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg
index f606657a5c..fe501993d4 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg
@@ -12,7 +12,6 @@ variant = AA 0.4
 weight = 1
 
 [values]
-infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg
index 0d2f4ada37..f9c44650c2 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg
@@ -12,7 +12,6 @@ variant = AA 0.4
 weight = -1
 
 [values]
-infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15
 material_print_temperature = =default_material_print_temperature + 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg
index 50307f198e..d7b82b4a1c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg
@@ -12,7 +12,6 @@ variant = AA 0.4
 weight = 0
 
 [values]
-infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg
index f8fb8ff080..76a248a749 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg
@@ -12,7 +12,6 @@ variant = AA 0.4
 weight = -2
 
 [values]
-infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15
 material_print_temperature = =default_material_print_temperature + 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg
index cbd0c41053..046b9f6ce2 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg
@@ -13,8 +13,6 @@ weight = 1
 
 [values]
 brim_width = 20
-infill_overlap = 0
-infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg
index 034a9f2691..c1d488bf5f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg
@@ -13,7 +13,6 @@ weight = -1
 
 [values]
 brim_width = 20
-infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg
index 94ef6ac40a..d2a3b67d4c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg
@@ -13,7 +13,6 @@ weight = 0
 
 [values]
 brim_width = 20
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg
index 0bea9430eb..c95009797d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg
@@ -13,8 +13,6 @@ weight = -2
 
 [values]
 brim_width = 20
-infill_overlap = 0
-infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg
index 94bd77bb0a..b2cbff9177 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg
@@ -13,7 +13,6 @@ weight = -1
 
 [values]
 brim_width = 20
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg
index a33459c48b..309f646559 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg
@@ -13,7 +13,6 @@ weight = 0
 
 [values]
 brim_width = 20
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg
index 9c263be5fa..234ec47e8f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg
@@ -13,7 +13,6 @@ weight = -2
 
 [values]
 brim_width = 20
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg
index 92529264d4..18aaeb6470 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg
@@ -14,7 +14,6 @@ weight = -1
 [values]
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg
index fbeab218de..e8e7410cd5 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg
@@ -14,7 +14,6 @@ weight = 0
 [values]
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg
index 060ead7851..e24ab778b5 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg
@@ -14,7 +14,6 @@ weight = -2
 [values]
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg
index 13309023e1..ae9144728a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg
@@ -12,6 +12,5 @@ variant = AA 0.25
 weight = 0
 
 [values]
-infill_overlap = =0 if infill_sparse_density > 80 else 15
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg
index e354c8ea0a..199995e5a1 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg
@@ -13,7 +13,6 @@ weight = 0
 
 [values]
 brim_width = 8
-infill_overlap = =0 if infill_sparse_density > 80 else 10
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg
index 687301d4ca..81d1d1f735 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg
@@ -13,7 +13,6 @@ weight = 0
 
 [values]
 brim_width = 8
-infill_overlap = =0 if infill_sparse_density > 80 else 10
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg
index ce799aa71b..e95804af3a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg
@@ -12,7 +12,6 @@ variant = AA 0.4
 weight = 1
 
 [values]
-infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg
index 06500fa8a2..ac1e50fd49 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg
@@ -12,7 +12,6 @@ variant = AA 0.4
 weight = -1
 
 [values]
-infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15
 material_print_temperature = =default_material_print_temperature + 10
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg
index cc67c275e6..77ccf92459 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg
@@ -12,7 +12,6 @@ variant = AA 0.4
 weight = 0
 
 [values]
-infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg
index 343c75edc8..dde22bbd42 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg
@@ -12,7 +12,6 @@ variant = AA 0.4
 weight = -2
 
 [values]
-infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15
 material_print_temperature = =default_material_print_temperature + 10
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg
index 0cc2dd1034..c19de26c93 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg
@@ -13,8 +13,6 @@ weight = 1
 
 [values]
 brim_width = 20
-infill_overlap = 0
-infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg
index 39ebf73602..b21da5f2e4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg
@@ -13,7 +13,6 @@ weight = -1
 
 [values]
 brim_width = 20
-infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg
index 342b54acee..c99934288e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg
@@ -13,7 +13,6 @@ weight = 0
 
 [values]
 brim_width = 20
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg
index 3ae49d3bbc..7eedf33df9 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg
@@ -13,8 +13,6 @@ weight = -2
 
 [values]
 brim_width = 20
-infill_overlap = 0
-infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg
index 55b045bab8..318a14834f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg
@@ -13,7 +13,6 @@ weight = -1
 
 [values]
 brim_width = 20
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg
index 10b2635220..1527a11fd0 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg
@@ -13,7 +13,6 @@ weight = 0
 
 [values]
 brim_width = 20
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg
index 1a2af02756..356fa2d4cb 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg
@@ -13,7 +13,6 @@ weight = -2
 
 [values]
 brim_width = 20
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
 machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg
index b2929e3509..b641bdbe13 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg
@@ -14,7 +14,6 @@ weight = -1
 [values]
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg
index 886fb10fd3..9a4f7c61fd 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg
@@ -14,7 +14,6 @@ weight = 0
 [values]
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg
index 04fe6c6f3a..3461b45736 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg
@@ -14,7 +14,6 @@ weight = -2
 [values]
 brim_width = 8.75
 gradual_infill_step_height = =5 * layer_height
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index 40febf632f..4190aab0cd 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -12,7 +12,6 @@ type = variant
 brim_width = 7
 cool_fan_speed = 7
 default_material_print_temperature = 200
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_print = 25
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index 0450141a6f..0067e86bd9 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -16,7 +16,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 brim_width = 3
 cool_fan_speed = 50
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_print = 25
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index 6797523969..941634e3a6 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -12,7 +12,6 @@ type = variant
 brim_width = 7
 cool_fan_speed = 7
 default_material_print_temperature = 200
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_print = 25
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index ac5af755b0..1ca125b2ef 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -16,7 +16,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 brim_width = 3
 cool_fan_speed = 50
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_print = 25
diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
index 500d76002c..c30365897b 100644
--- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
@@ -12,7 +12,6 @@ type = variant
 brim_width = 7
 cool_fan_speed = 7
 default_material_print_temperature = 200
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_print = 25
diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
index 599a9e2e9f..4e749009ea 100644
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -15,7 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 brim_width = 3
 cool_fan_speed = 50
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_print = 25
diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index 9dd140f82c..b482c418f0 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
@@ -12,7 +12,6 @@ type = variant
 brim_width = 7
 cool_fan_speed = 7
 default_material_print_temperature = 200
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_print = 25
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index 75406707fe..1484241e9d 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -15,7 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 brim_width = 3
 cool_fan_speed = 50
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_print = 25
diff --git a/resources/variants/ultimaker_s7_aa0.8.inst.cfg b/resources/variants/ultimaker_s7_aa0.8.inst.cfg
index 99582530f9..a5b6a66516 100644
--- a/resources/variants/ultimaker_s7_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s7_aa0.8.inst.cfg
@@ -12,7 +12,6 @@ type = variant
 brim_width = 7
 cool_fan_speed = 7
 default_material_print_temperature = 200
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_print = 25
diff --git a/resources/variants/ultimaker_s7_bb0.8.inst.cfg b/resources/variants/ultimaker_s7_bb0.8.inst.cfg
index 29ee17cf14..95bcaef78f 100644
--- a/resources/variants/ultimaker_s7_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s7_bb0.8.inst.cfg
@@ -15,7 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 brim_width = 3
 cool_fan_speed = 50
-infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
 jerk_print = 25