diff --git a/resources/definitions/ultimaker_s6.def.json b/resources/definitions/ultimaker_s6.def.json
index 2ee99acece..90a90fee26 100644
--- a/resources/definitions/ultimaker_s6.def.json
+++ b/resources/definitions/ultimaker_s6.def.json
@@ -9,9 +9,7 @@
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-ufp;text/x-gcode",
         "platform": "ultimaker_s5_platform.obj",
-        "bom_numbers": [
-            10700
-        ],
+        "bom_numbers": [10700, 10701],
         "firmware_update_info":
         {
             "check_urls": [ "https://software.ultimaker.com/releases/firmware/5078167/stable/um-update.swu.version" ],
diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json
index 74e8d3884a..9ea04fc86d 100644
--- a/resources/definitions/ultimaker_s8.def.json
+++ b/resources/definitions/ultimaker_s8.def.json
@@ -12,6 +12,17 @@
         "bom_numbers": [
             10600
         ],
+        "exclude_materials": [
+            "generic_hips",
+            "generic_flexible",
+            "generic_cffpps",
+            "generic_cffpa",
+            "generic_cffcpe",
+            "generic_gffpa",
+            "generic_gffcpe",
+            "structur3d_",
+            "ultimaker_ppscf"
+        ],
         "firmware_update_info":
         {
             "check_urls": [ "https://software.ultimaker.com/releases/firmware/10600/stable/um-update.swu.version" ],
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 1aa8b3c714..d3d99eec9e 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
@@ -16,4 +16,5 @@ material_final_print_temperature = =material_print_temperature - 15
 material_initial_print_temperature = =material_print_temperature - 15
 retraction_prime_speed = =retraction_speed
 support_structure = tree
+top_bottom_thickness = =round(6*layer_height,3)
 
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 db50b82bd2..6ccc0da6dd 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
@@ -14,4 +14,5 @@ weight = 0
 [values]
 retraction_prime_speed = =retraction_speed
 support_structure = tree
+top_bottom_thickness = =round(6*layer_height,3)
 
diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg
index 5432e98165..0038bb0a4d 100644
--- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg
@@ -12,4 +12,5 @@ variant = CC+ 0.4
 weight = -2
 
 [values]
+switch_extruder_retraction_amount = 16
 
diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg
index 52dc6f1a5e..347609f932 100644
--- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg
@@ -15,4 +15,5 @@ weight = -2
 bridge_skin_material_flow = 200
 bridge_wall_material_flow = 200
 support_interface_enable = False
+switch_extruder_retraction_amount = 16
 
diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.3mm.inst.cfg
index cd42a93fec..3ed9849814 100644
--- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.3mm.inst.cfg
@@ -16,5 +16,6 @@ bridge_skin_material_flow = 200
 bridge_wall_material_flow = 200
 material_print_temperature = =default_material_print_temperature + 10
 support_interface_enable = False
+switch_extruder_retraction_amount = 16
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)