diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 872a7a6876..e12d285ff2 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -239,6 +239,9 @@
         "gradual_support_infill_step_height": {
             "value": "4*layer_height"
         },
+        "raft_base_thickness": {
+            "value": "min(machine_nozzle_size * 0.75, 0.3)"
+        },
         "raft_interface_line_width": {
             "value": "(raft_base_line_width + raft_surface_line_width) / 2"
         },
diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index 71115ad0e8..0988d7a6e4 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -112,7 +112,6 @@
         "optimize_wall_printing_order": { "value": "True" },
         "prime_tower_enable": { "default_value": true },
         "raft_airgap": { "value": "0" },
-        "raft_base_thickness": { "value": "0.3" },
         "retraction_amount": { "value": "6.5" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index f80291fc00..a49d9ecc35 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -102,7 +102,6 @@
         "prime_tower_enable": { "value": "True" },
         "raft_airgap": { "value": "0" },
         "raft_base_speed": { "value": "20" },
-        "raft_base_thickness": { "value": "0.3" },
         "raft_interface_speed": { "value": "20" },
         "raft_speed": { "value": "25" },
         "retraction_amount": { "value": "6.5" },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 09543568b9..4808522393 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -103,7 +103,6 @@
         "prime_tower_enable": { "value": "True" },
         "raft_airgap": { "value": "0" },
         "raft_base_speed": { "value": "20" },
-        "raft_base_thickness": { "value": "0.3" },
         "raft_interface_speed": { "value": "20" },
         "raft_speed": { "value": "25" },
         "retraction_amount": { "value": "6.5" },
diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg
index 1e216b134b..5d6a33d365 100644
--- a/resources/variants/ultimaker3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.25.inst.cfg
@@ -19,7 +19,6 @@ machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg
index 97749bd3c7..39147a50d7 100644
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@@ -15,7 +15,6 @@ machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index b0b77ee893..daabe534b3 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -34,7 +34,6 @@ prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
 raft_base_speed = 20
-raft_base_thickness = 0.3
 raft_interface_speed = 20
 raft_speed = 25
 raft_surface_layers = 1
diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
index 03333a181f..612f09b509 100644
--- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
@@ -19,7 +19,6 @@ machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg
index 32ca061513..206539e5b6 100644
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@@ -15,7 +15,6 @@ machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index 5f72d8f019..e06785e07c 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -34,7 +34,6 @@ prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
 raft_base_speed = 20
-raft_base_thickness = 0.3
 raft_interface_speed = 20
 raft_speed = 25
 raft_surface_layers = 1
diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
index 71138ffe7b..f4c025b8fe 100644
--- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
@@ -19,7 +19,6 @@ machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg
index f26ca1f2b5..e602c9387f 100644
--- a/resources/variants/ultimaker_s3_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa04.inst.cfg
@@ -15,7 +15,6 @@ machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
index f93e995241..03109856cf 100644
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -33,7 +33,6 @@ prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
 raft_base_speed = 20
-raft_base_thickness = 0.3
 raft_interface_speed = 20
 raft_speed = 25
 raft_surface_layers = 1
diff --git a/resources/variants/ultimaker_s3_cc04.inst.cfg b/resources/variants/ultimaker_s3_cc04.inst.cfg
index de8146e489..8aa1be2cc8 100644
--- a/resources/variants/ultimaker_s3_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc04.inst.cfg
@@ -15,7 +15,6 @@ machine_nozzle_id = CC 0.4
 machine_nozzle_size = 0.4
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg
index f705717b1c..a6ec116b7f 100644
--- a/resources/variants/ultimaker_s3_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc06.inst.cfg
@@ -15,7 +15,6 @@ machine_nozzle_id = CC 0.6
 machine_nozzle_size = 0.6
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
index cfec7db50c..11637d1ba9 100644
--- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
@@ -19,7 +19,6 @@ machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg
index 6ccec2417d..a0505e8a78 100644
--- a/resources/variants/ultimaker_s5_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa04.inst.cfg
@@ -15,7 +15,6 @@ machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index a4d317bde1..53f2b4ea6c 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -33,7 +33,6 @@ prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
 raft_base_speed = 20
-raft_base_thickness = 0.3
 raft_interface_speed = 20
 raft_speed = 25
 raft_surface_layers = 1
diff --git a/resources/variants/ultimaker_s5_cc04.inst.cfg b/resources/variants/ultimaker_s5_cc04.inst.cfg
index ea803e74ed..52ff804937 100644
--- a/resources/variants/ultimaker_s5_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc04.inst.cfg
@@ -15,7 +15,6 @@ machine_nozzle_id = CC 0.4
 machine_nozzle_size = 0.4
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg
index d52371338f..4370bb1c4b 100644
--- a/resources/variants/ultimaker_s5_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc06.inst.cfg
@@ -15,7 +15,6 @@ machine_nozzle_id = CC 0.6
 machine_nozzle_size = 0.6
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print