diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json
index 48f89a5502..165a7719b2 100644
--- a/resources/definitions/ultimaker_s8.def.json
+++ b/resources/definitions/ultimaker_s8.def.json
@@ -238,6 +238,7 @@
         "extra_infill_lines_to_support_skins": { "value": "'walls_and_lines'" },
         "flooring_layer_count": { "value": 1 },
         "flooring_material_flow": { "value": "skin_material_flow * 110/93" },
+        "flooring_monotonic": { "value": false },
         "gradual_flow_discretisation_step_size": { "value": 1 },
         "gradual_flow_enabled": { "value": true },
         "hole_xy_offset": { "value": 0.075 },
@@ -446,11 +447,13 @@
         "retraction_hop_enabled": { "value": true },
         "retraction_min_travel": { "value": "2.5 if support_enable and support_structure=='tree' else line_width * 2.5" },
         "retraction_prime_speed": { "value": 15 },
+        "roofing_monotonic": { "value": false },
+        "roofing_pattern": { "value": "'zigzag'" },
         "seam_overhang_angle": { "value": 35 },
         "skin_edge_support_thickness": { "value": 0 },
         "skin_material_flow": { "value": 93 },
         "skin_outline_count": { "value": 0 },
-        "skin_overlap": { "value": 0 },
+        "skin_overlap": { "value": 20 },
         "skin_preshrink": { "value": 0 },
         "skirt_brim_minimal_length": { "value": 1000 },
         "skirt_brim_speed":
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 23863493e9..014a2012c8 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
@@ -18,6 +18,7 @@ cool_min_temperature = =material_print_temperature - 20
 hole_xy_offset = 0.1
 inset_direction = inside-out
 retraction_prime_speed = 15
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
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 c739be3112..9e9320d45d 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
@@ -17,6 +17,7 @@ hole_xy_offset = 0.1
 inset_direction = inside-out
 material_print_temperature = =default_material_print_temperature + 5
 retraction_prime_speed = 15
+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
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 e206c6ca7c..a63f0371b4 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
@@ -18,6 +18,7 @@ inset_direction = inside-out
 material_final_print_temperature = =material_print_temperature - 15
 material_initial_print_temperature = =material_print_temperature - 15
 retraction_prime_speed = =retraction_speed
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
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 19575814fd..b9ed1a649a 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
@@ -18,6 +18,7 @@ inset_direction = inside-out
 material_final_print_temperature = =material_print_temperature - 15
 material_initial_print_temperature = =material_print_temperature - 15
 retraction_prime_speed = =retraction_speed
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
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 72132baab2..8ab383a08d 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
@@ -18,6 +18,7 @@ inset_direction = inside-out
 material_final_print_temperature = =material_print_temperature - 15
 material_initial_print_temperature = =material_print_temperature - 15
 retraction_prime_speed = =retraction_speed
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
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 c7daafbcf6..2f48c95b7b 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
@@ -17,6 +17,7 @@ hole_xy_offset = 0.1
 inset_direction = inside-out
 retraction_prime_speed = =retraction_speed
 retraction_speed = 25
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
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 ffcdbf79e3..d32f2466ea 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
@@ -16,6 +16,7 @@ cool_min_temperature = =material_print_temperature - 20
 hole_xy_offset = 0.1
 inset_direction = inside-out
 retraction_prime_speed = =retraction_speed
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree
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 9dc8f752d8..a7eebb69be 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
@@ -16,6 +16,7 @@ cool_min_temperature = =material_print_temperature - 20
 hole_xy_offset = 0.1
 inset_direction = inside-out
 retraction_prime_speed = =retraction_speed
+speed_roofing = =speed_topbottom * 1/3
 speed_wall_x = =speed_wall
 speed_wall_x_roofing = =speed_wall * 0.8
 support_structure = tree