diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg
index 839b00aa2a..8552ba138c 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg
@@ -12,8 +12,9 @@ variant = CC 0.4
 weight = -1
 
 [values]
+cool_fan_speed_max = =cool_fan_speed
 infill_overlap = =0 if infill_sparse_density > 80 else 10
-raft_airgap = =layer_height * 2
+raft_airgap = =layer_height
 skin_overlap = 20
 speed_infill = =speed_print
 speed_print = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg
index c021df62a0..26d8940754 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg
@@ -12,8 +12,9 @@ variant = CC 0.4
 weight = -2
 
 [values]
+cool_fan_speed_max = =cool_fan_speed
 infill_overlap = =0 if infill_sparse_density > 80 else 10
-raft_airgap = =layer_height * 2
+raft_airgap = =layer_height
 skin_overlap = 20
 speed_infill = =speed_print
 speed_print = 25
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg
index 30fa75bd16..b33a87fec4 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg
@@ -12,8 +12,9 @@ variant = CC 0.6
 weight = -1
 
 [values]
+cool_fan_speed_max = =cool_fan_speed
 infill_overlap = =0 if infill_sparse_density > 80 else 10
-raft_airgap = =layer_height * 2
+raft_airgap = =layer_height
 skin_overlap = 20
 speed_infill = =speed_print
 speed_print = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg
index 4e4c273b5c..6fd439bc0f 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg
@@ -12,8 +12,9 @@ variant = CC 0.6
 weight = -2
 
 [values]
+cool_fan_speed_max = =cool_fan_speed
 infill_overlap = =0 if infill_sparse_density > 80 else 10
-raft_airgap = =layer_height * 2
+raft_airgap = =layer_height
 skin_overlap = 20
 speed_infill = =speed_print
 speed_print = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg
index e3fd438910..797819f63f 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg
@@ -12,8 +12,9 @@ variant = CC 0.6
 weight = -3
 
 [values]
+cool_fan_speed_max = =cool_fan_speed
 infill_overlap = =0 if infill_sparse_density > 80 else 10
-raft_airgap = =layer_height * 2
+raft_airgap = =layer_height
 skin_overlap = 20
 speed_infill = =speed_print
 speed_print = 30
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg
index f8cf34dfaf..55cccbd4ce 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg
@@ -12,8 +12,9 @@ variant = CC 0.4
 weight = -1
 
 [values]
+cool_fan_speed_max = =cool_fan_speed
 infill_overlap = =0 if infill_sparse_density > 80 else 10
-raft_airgap = =layer_height * 2
+raft_airgap = =layer_height
 skin_overlap = 20
 speed_infill = =speed_print
 speed_print = 30
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg
index 315e57947f..807c01351c 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg
@@ -12,8 +12,9 @@ variant = CC 0.4
 weight = -2
 
 [values]
+cool_fan_speed_max = =cool_fan_speed
 infill_overlap = =0 if infill_sparse_density > 80 else 10
-raft_airgap = =layer_height * 2
+raft_airgap = =layer_height
 skin_overlap = 20
 speed_infill = =speed_print
 speed_print = 25
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg
index 3e8d8fcf23..825b1cb72a 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg
@@ -12,8 +12,9 @@ variant = CC 0.6
 weight = -1
 
 [values]
+cool_fan_speed_max = =cool_fan_speed
 infill_overlap = =0 if infill_sparse_density > 80 else 10
-raft_airgap = =layer_height * 2
+raft_airgap = =layer_height
 skin_overlap = 20
 speed_infill = =speed_print
 speed_print = 30
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg
index 7fbd36d296..8ed7f40558 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg
@@ -12,8 +12,9 @@ variant = CC 0.6
 weight = -2
 
 [values]
+cool_fan_speed_max = =cool_fan_speed
 infill_overlap = =0 if infill_sparse_density > 80 else 10
-raft_airgap = =layer_height * 2
+raft_airgap = =layer_height
 skin_overlap = 20
 speed_infill = =speed_print
 speed_print = 30
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg
index 30aea77686..40674e41b1 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg
@@ -12,8 +12,9 @@ variant = CC 0.6
 weight = -3
 
 [values]
+cool_fan_speed_max = =cool_fan_speed
 infill_overlap = =0 if infill_sparse_density > 80 else 10
-raft_airgap = =layer_height * 2
+raft_airgap = =layer_height
 skin_overlap = 20
 speed_infill = =speed_print
 speed_print = 30