diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json
index 8f9683412f..be49d8e88d 100644
--- a/resources/definitions/ultimaker_s8.def.json
+++ b/resources/definitions/ultimaker_s8.def.json
@@ -430,7 +430,7 @@
         "material_print_temperature": { "maximum_value_warning": 320 },
         "material_print_temperature_layer_0": { "maximum_value_warning": 320 },
         "max_flow_acceleration": { "value": 1.5 },
-        "max_skin_angle_for_expansion": { "value": 45 },
+        "max_skin_angle_for_expansion": { "value": 90 },
         "meshfix_maximum_resolution": { "value": 0.4 },
         "min_infill_area": { "default_value": 10 },
         "optimize_wall_printing_order": { "value": false },
@@ -447,7 +447,8 @@
         "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_extension": { "value": 2 },
+        "roofing_monotonic": { "value": true },
         "roofing_pattern": { "value": "'lines'" },
         "seam_overhang_angle": { "value": 35 },
         "skin_edge_support_thickness": { "value": 0.8 },
diff --git a/resources/variants/ultimaker_s6_aa025.inst.cfg b/resources/variants/ultimaker_s6_aa025.inst.cfg
index 95ac4eeb3b..e90473103b 100644
--- a/resources/variants/ultimaker_s6_aa025.inst.cfg
+++ b/resources/variants/ultimaker_s6_aa025.inst.cfg
@@ -112,6 +112,7 @@ retraction_hop_after_extruder_switch_height = =retraction_hop
 retraction_hop_enabled = =extruders_enabled_count > 1
 retraction_min_travel = 5
 retraction_prime_speed = =retraction_speed
+roofing_extension = 0
 roofing_monotonic = True
 roofing_pattern = =top_bottom_pattern
 seam_overhang_angle = =support_angle
diff --git a/resources/variants/ultimaker_s6_aa04.inst.cfg b/resources/variants/ultimaker_s6_aa04.inst.cfg
index ac227c8cd0..a12753fc41 100644
--- a/resources/variants/ultimaker_s6_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s6_aa04.inst.cfg
@@ -112,6 +112,7 @@ retraction_hop_after_extruder_switch_height = =retraction_hop
 retraction_hop_enabled = =extruders_enabled_count > 1
 retraction_min_travel = 5
 retraction_prime_speed = 15
+roofing_extension = 0
 roofing_monotonic = True
 roofing_pattern = =top_bottom_pattern
 seam_overhang_angle = =support_angle
diff --git a/resources/variants/ultimaker_s6_aa08.inst.cfg b/resources/variants/ultimaker_s6_aa08.inst.cfg
index 760ce661b9..2269c0cba2 100644
--- a/resources/variants/ultimaker_s6_aa08.inst.cfg
+++ b/resources/variants/ultimaker_s6_aa08.inst.cfg
@@ -123,6 +123,7 @@ retraction_hop_only_when_collides = True
 retraction_min_travel = 5
 retraction_prime_speed = 15
 retraction_speed = 25
+roofing_extension = 0
 roofing_monotonic = True
 roofing_pattern = =top_bottom_pattern
 seam_overhang_angle = =support_angle
diff --git a/resources/variants/ultimaker_s6_cc04.inst.cfg b/resources/variants/ultimaker_s6_cc04.inst.cfg
index 37573be739..9baa9ceb0e 100644
--- a/resources/variants/ultimaker_s6_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s6_cc04.inst.cfg
@@ -111,6 +111,7 @@ retraction_hop_after_extruder_switch_height = =retraction_hop
 retraction_hop_enabled = =extruders_enabled_count > 1
 retraction_min_travel = 5
 retraction_prime_speed = =retraction_speed
+roofing_extension = 0
 roofing_monotonic = True
 roofing_pattern = =top_bottom_pattern
 seam_overhang_angle = =support_angle
diff --git a/resources/variants/ultimaker_s6_cc06.inst.cfg b/resources/variants/ultimaker_s6_cc06.inst.cfg
index 595a181f63..4adcb69336 100644
--- a/resources/variants/ultimaker_s6_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s6_cc06.inst.cfg
@@ -111,6 +111,7 @@ retraction_hop_after_extruder_switch_height = =retraction_hop
 retraction_hop_enabled = =extruders_enabled_count > 1
 retraction_min_travel = 5
 retraction_prime_speed = =retraction_speed
+roofing_extension = 0
 roofing_monotonic = True
 roofing_pattern = =top_bottom_pattern
 seam_overhang_angle = =support_angle
diff --git a/resources/variants/ultimaker_s8_aa025.inst.cfg b/resources/variants/ultimaker_s8_aa025.inst.cfg
index 96e31fbb04..883a551da8 100644
--- a/resources/variants/ultimaker_s8_aa025.inst.cfg
+++ b/resources/variants/ultimaker_s8_aa025.inst.cfg
@@ -112,6 +112,7 @@ retraction_hop_after_extruder_switch_height = =retraction_hop
 retraction_hop_enabled = =extruders_enabled_count > 1
 retraction_min_travel = 5
 retraction_prime_speed = =retraction_speed
+roofing_extension = 0
 roofing_monotonic = True
 roofing_pattern = =top_bottom_pattern
 seam_overhang_angle = =support_angle
diff --git a/resources/variants/ultimaker_s8_aa04.inst.cfg b/resources/variants/ultimaker_s8_aa04.inst.cfg
index 8e7df64b79..3a181f9c46 100644
--- a/resources/variants/ultimaker_s8_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s8_aa04.inst.cfg
@@ -112,6 +112,7 @@ retraction_hop_after_extruder_switch_height = =retraction_hop
 retraction_hop_enabled = =extruders_enabled_count > 1
 retraction_min_travel = 5
 retraction_prime_speed = 15
+roofing_extension = 0
 roofing_monotonic = True
 roofing_pattern = =top_bottom_pattern
 seam_overhang_angle = =support_angle
diff --git a/resources/variants/ultimaker_s8_aa08.inst.cfg b/resources/variants/ultimaker_s8_aa08.inst.cfg
index ca0e09485e..ebbaa15620 100644
--- a/resources/variants/ultimaker_s8_aa08.inst.cfg
+++ b/resources/variants/ultimaker_s8_aa08.inst.cfg
@@ -123,6 +123,7 @@ retraction_hop_only_when_collides = True
 retraction_min_travel = 5
 retraction_prime_speed = 15
 retraction_speed = 25
+roofing_extension = 0
 roofing_monotonic = True
 roofing_pattern = =top_bottom_pattern
 seam_overhang_angle = =support_angle
diff --git a/resources/variants/ultimaker_s8_cc04.inst.cfg b/resources/variants/ultimaker_s8_cc04.inst.cfg
index 91a7186c0d..f0dbf19934 100644
--- a/resources/variants/ultimaker_s8_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s8_cc04.inst.cfg
@@ -111,6 +111,7 @@ retraction_hop_after_extruder_switch_height = =retraction_hop
 retraction_hop_enabled = =extruders_enabled_count > 1
 retraction_min_travel = 5
 retraction_prime_speed = =retraction_speed
+roofing_extension = 0
 roofing_monotonic = True
 roofing_pattern = =top_bottom_pattern
 seam_overhang_angle = =support_angle
diff --git a/resources/variants/ultimaker_s8_cc06.inst.cfg b/resources/variants/ultimaker_s8_cc06.inst.cfg
index 3ccfe3e2d6..e81dfa1543 100644
--- a/resources/variants/ultimaker_s8_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s8_cc06.inst.cfg
@@ -111,6 +111,7 @@ retraction_hop_after_extruder_switch_height = =retraction_hop
 retraction_hop_enabled = =extruders_enabled_count > 1
 retraction_min_travel = 5
 retraction_prime_speed = =retraction_speed
+roofing_extension = 0
 roofing_monotonic = True
 roofing_pattern = =top_bottom_pattern
 seam_overhang_angle = =support_angle