diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json
index 96b86f4632..ed1915cbe9 100644
--- a/resources/definitions/ultimaker_s8.def.json
+++ b/resources/definitions/ultimaker_s8.def.json
@@ -209,14 +209,11 @@
             "value": 35
         },
         "bridge_skin_speed_2": { "value": "speed_print*2/3" },
-        "bridge_sparse_infill_max_density": { "value": 50 },
+        "bridge_skin_support_threshold": { "value": 20 },
+        "bridge_sparse_infill_max_density": { "value": 20 },
         "bridge_wall_material_flow": { "value": 200 },
         "bridge_wall_min_length": { "value": 2 },
-        "bridge_wall_speed":
-        {
-            "unit": "mm/s",
-            "value": 50
-        },
+        "bridge_wall_speed": { "value": 50 },
         "build_volume_temperature":
         {
             "force_depends_on_settings": [
@@ -453,7 +450,7 @@
         "roofing_monotonic": { "value": false },
         "roofing_pattern": { "value": "'zigzag'" },
         "seam_overhang_angle": { "value": 35 },
-        "skin_edge_support_thickness": { "value": 0 },
+        "skin_edge_support_thickness": { "value": 0.8 },
         "skin_material_flow": { "value": 93 },
         "skin_outline_count": { "value": 0 },
         "skin_overlap": { "value": 20 },
diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_quick.inst.cfg
index 490d975079..1527b99002 100644
--- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_quick.inst.cfg
@@ -23,5 +23,6 @@ speed_wall = =speed_print
 speed_wall_x = =speed_print
 speed_wall_x_roofing = =speed_wall
 wall_line_width_x = =wall_line_width
+wall_thickness = =wall_line_width_0 + wall_line_width_x
 xy_offset = 0.075
 
diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_quick.inst.cfg
index 0784e0bfac..d671176cbd 100644
--- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_quick.inst.cfg
@@ -23,5 +23,6 @@ speed_wall = =speed_print
 speed_wall_x = =speed_print
 speed_wall_x_roofing = =speed_wall
 wall_line_width_x = =wall_line_width
+wall_thickness = =wall_line_width_0 + wall_line_width_x
 xy_offset = 0.075
 
diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_quick.inst.cfg
index 32dda9289e..0fe6907cc3 100644
--- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_quick.inst.cfg
@@ -23,5 +23,6 @@ speed_wall = =speed_print
 speed_wall_x = =speed_print
 speed_wall_x_roofing = =speed_wall
 wall_line_width_x = =wall_line_width
+wall_thickness = =wall_line_width_0 + wall_line_width_x
 xy_offset = 0.075
 
diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_quick.inst.cfg
index d2ff7ee7a3..f39d44f4f8 100644
--- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_quick.inst.cfg
@@ -23,5 +23,6 @@ speed_wall = =speed_print
 speed_wall_x = =speed_print
 speed_wall_x_roofing = =speed_wall
 wall_line_width_x = =wall_line_width
+wall_thickness = =wall_line_width_0 + wall_line_width_x
 xy_offset = 0.075
 
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm.inst.cfg
index 2fc2e01d53..dcb79ffbee 100644
--- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm.inst.cfg
@@ -23,5 +23,6 @@ speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 wall_line_width_x = =wall_line_width * 1.25
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg
index e8b104ef29..fd3942a782 100644
--- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg
@@ -21,5 +21,6 @@ speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 wall_line_width_x = =wall_line_width * 1.25
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg
index 4647d9effe..3807598f26 100644
--- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg
@@ -23,5 +23,6 @@ speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 wall_line_width_x = =wall_line_width * 1.25
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg
index cef87858d3..c047ded9c3 100644
--- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg
@@ -24,5 +24,6 @@ speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 top_bottom_thickness = =round(6*layer_height,3)
 wall_line_width_x = =wall_line_width * 1.25
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg
index 70ee3c42f6..580f05d0b7 100644
--- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg
@@ -23,5 +23,6 @@ speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 wall_line_width_x = =wall_line_width * 1.25
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg
index 25557fa70b..06d3c93cf3 100644
--- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg
@@ -22,5 +22,6 @@ speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 wall_line_width_x = =wall_line_width * 1.25
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg
index b30f18f3f6..6099457369 100644
--- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg
@@ -22,5 +22,6 @@ speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 top_bottom_thickness = =round(6*layer_height,3)
 wall_line_width_x = =wall_line_width * 1.25
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm.inst.cfg
index 7b07575caf..373fa7b78e 100644
--- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm.inst.cfg
@@ -21,5 +21,6 @@ speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
 wall_line_width_x = =wall_line_width * 1.25
+wall_thickness = =wall_line_width_0 + 2*wall_line_width_x
 xy_offset = 0.025
 
diff --git a/resources/variants/ultimaker_s6_aa025.inst.cfg b/resources/variants/ultimaker_s6_aa025.inst.cfg
index 589778cefb..95ac4eeb3b 100644
--- a/resources/variants/ultimaker_s6_aa025.inst.cfg
+++ b/resources/variants/ultimaker_s6_aa025.inst.cfg
@@ -41,6 +41,7 @@ bridge_skin_material_flow = =skin_material_flow
 bridge_skin_material_flow_2 = =skin_material_flow
 bridge_skin_speed = =speed_topbottom
 bridge_skin_speed_2 = =speed_topbottom
+bridge_skin_support_threshold = 50
 bridge_sparse_infill_max_density = 0
 bridge_wall_material_flow = =wall_material_flow
 bridge_wall_min_length = =line_width + support_xy_distance + 1.0
diff --git a/resources/variants/ultimaker_s6_aa04.inst.cfg b/resources/variants/ultimaker_s6_aa04.inst.cfg
index 673062ce77..ac227c8cd0 100644
--- a/resources/variants/ultimaker_s6_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s6_aa04.inst.cfg
@@ -41,6 +41,7 @@ bridge_skin_material_flow = =skin_material_flow
 bridge_skin_material_flow_2 = =skin_material_flow
 bridge_skin_speed = =speed_topbottom
 bridge_skin_speed_2 = =speed_topbottom
+bridge_skin_support_threshold = 50
 bridge_sparse_infill_max_density = 0
 bridge_wall_material_flow = =wall_material_flow
 bridge_wall_min_length = =line_width + support_xy_distance + 1.0
diff --git a/resources/variants/ultimaker_s6_aa08.inst.cfg b/resources/variants/ultimaker_s6_aa08.inst.cfg
index 93ab1f0279..760ce661b9 100644
--- a/resources/variants/ultimaker_s6_aa08.inst.cfg
+++ b/resources/variants/ultimaker_s6_aa08.inst.cfg
@@ -41,6 +41,7 @@ bridge_skin_material_flow = =skin_material_flow
 bridge_skin_material_flow_2 = =skin_material_flow
 bridge_skin_speed = =speed_topbottom
 bridge_skin_speed_2 = =speed_topbottom
+bridge_skin_support_threshold = 50
 bridge_sparse_infill_max_density = 0
 bridge_wall_material_flow = =wall_material_flow
 bridge_wall_min_length = =line_width + support_xy_distance + 1.0
diff --git a/resources/variants/ultimaker_s6_cc04.inst.cfg b/resources/variants/ultimaker_s6_cc04.inst.cfg
index 4c2035a130..37573be739 100644
--- a/resources/variants/ultimaker_s6_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s6_cc04.inst.cfg
@@ -41,6 +41,7 @@ bridge_skin_material_flow = =skin_material_flow
 bridge_skin_material_flow_2 = =skin_material_flow
 bridge_skin_speed = =speed_topbottom
 bridge_skin_speed_2 = =speed_topbottom
+bridge_skin_support_threshold = 50
 bridge_sparse_infill_max_density = 0
 bridge_wall_material_flow = =wall_material_flow
 bridge_wall_min_length = =line_width + support_xy_distance + 1.0
diff --git a/resources/variants/ultimaker_s6_cc06.inst.cfg b/resources/variants/ultimaker_s6_cc06.inst.cfg
index 134a11a8d4..595a181f63 100644
--- a/resources/variants/ultimaker_s6_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s6_cc06.inst.cfg
@@ -41,6 +41,7 @@ bridge_skin_material_flow = =skin_material_flow
 bridge_skin_material_flow_2 = =skin_material_flow
 bridge_skin_speed = =speed_topbottom
 bridge_skin_speed_2 = =speed_topbottom
+bridge_skin_support_threshold = 50
 bridge_sparse_infill_max_density = 0
 bridge_wall_material_flow = =wall_material_flow
 bridge_wall_min_length = =line_width + support_xy_distance + 1.0
diff --git a/resources/variants/ultimaker_s8_aa025.inst.cfg b/resources/variants/ultimaker_s8_aa025.inst.cfg
index bcf3c21cfb..96e31fbb04 100644
--- a/resources/variants/ultimaker_s8_aa025.inst.cfg
+++ b/resources/variants/ultimaker_s8_aa025.inst.cfg
@@ -41,6 +41,7 @@ bridge_skin_material_flow = =skin_material_flow
 bridge_skin_material_flow_2 = =skin_material_flow
 bridge_skin_speed = =speed_topbottom
 bridge_skin_speed_2 = =speed_topbottom
+bridge_skin_support_threshold = 50
 bridge_sparse_infill_max_density = 0
 bridge_wall_material_flow = =wall_material_flow
 bridge_wall_min_length = =line_width + support_xy_distance + 1.0
diff --git a/resources/variants/ultimaker_s8_aa04.inst.cfg b/resources/variants/ultimaker_s8_aa04.inst.cfg
index d74f0fb398..8e7df64b79 100644
--- a/resources/variants/ultimaker_s8_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s8_aa04.inst.cfg
@@ -41,6 +41,7 @@ bridge_skin_material_flow = =skin_material_flow
 bridge_skin_material_flow_2 = =skin_material_flow
 bridge_skin_speed = =speed_topbottom
 bridge_skin_speed_2 = =speed_topbottom
+bridge_skin_support_threshold = 50
 bridge_sparse_infill_max_density = 0
 bridge_wall_material_flow = =wall_material_flow
 bridge_wall_min_length = =line_width + support_xy_distance + 1.0
diff --git a/resources/variants/ultimaker_s8_aa08.inst.cfg b/resources/variants/ultimaker_s8_aa08.inst.cfg
index 7aa2730395..ca0e09485e 100644
--- a/resources/variants/ultimaker_s8_aa08.inst.cfg
+++ b/resources/variants/ultimaker_s8_aa08.inst.cfg
@@ -41,6 +41,7 @@ bridge_skin_material_flow = =skin_material_flow
 bridge_skin_material_flow_2 = =skin_material_flow
 bridge_skin_speed = =speed_topbottom
 bridge_skin_speed_2 = =speed_topbottom
+bridge_skin_support_threshold = 50
 bridge_sparse_infill_max_density = 0
 bridge_wall_material_flow = =wall_material_flow
 bridge_wall_min_length = =line_width + support_xy_distance + 1.0
diff --git a/resources/variants/ultimaker_s8_cc04.inst.cfg b/resources/variants/ultimaker_s8_cc04.inst.cfg
index 7db1cd1063..91a7186c0d 100644
--- a/resources/variants/ultimaker_s8_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s8_cc04.inst.cfg
@@ -41,6 +41,7 @@ bridge_skin_material_flow = =skin_material_flow
 bridge_skin_material_flow_2 = =skin_material_flow
 bridge_skin_speed = =speed_topbottom
 bridge_skin_speed_2 = =speed_topbottom
+bridge_skin_support_threshold = 50
 bridge_sparse_infill_max_density = 0
 bridge_wall_material_flow = =wall_material_flow
 bridge_wall_min_length = =line_width + support_xy_distance + 1.0
diff --git a/resources/variants/ultimaker_s8_cc06.inst.cfg b/resources/variants/ultimaker_s8_cc06.inst.cfg
index 3672f3d8a0..3ccfe3e2d6 100644
--- a/resources/variants/ultimaker_s8_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s8_cc06.inst.cfg
@@ -41,6 +41,7 @@ bridge_skin_material_flow = =skin_material_flow
 bridge_skin_material_flow_2 = =skin_material_flow
 bridge_skin_speed = =speed_topbottom
 bridge_skin_speed_2 = =speed_topbottom
+bridge_skin_support_threshold = 50
 bridge_sparse_infill_max_density = 0
 bridge_wall_material_flow = =wall_material_flow
 bridge_wall_min_length = =line_width + support_xy_distance + 1.0