diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 2e9f4abda1..5a66076307 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -48,23 +48,111 @@
         "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" },
         "infill_overlap": { "value": "0 if infill_sparse_density > 80 else 10" },
         "inset_direction": { "value": "'outside_in'" },
-        "jerk_infill": { "minimum_value_warning": 20 },
-        "jerk_prime_tower": { "minimum_value_warning": 20 },
+        "jerk_flooring":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_infill":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_layer_0": { "minimum_value": 1 },
+        "jerk_prime_tower":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
         "jerk_print":
         {
+            "minimum_value": 1,
             "minimum_value_warning": 20,
             "value": "20"
         },
-        "jerk_print_layer_0": { "value": "max(20, jerk_wall_0)" },
-        "jerk_roofing": { "minimum_value_warning": 20 },
-        "jerk_support": { "minimum_value_warning": 20 },
-        "jerk_support_infill": { "minimum_value_warning": 20 },
-        "jerk_support_interface": { "minimum_value_warning": 20 },
-        "jerk_topbottom": { "minimum_value_warning": 20 },
-        "jerk_travel": { "value": "jerk_print" },
+        "jerk_print_layer_0":
+        {
+            "minimum_value": 1,
+            "value": "max(20, jerk_wall_0)"
+        },
+        "jerk_roofing":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_skirt_brim": { "minimum_value": 1 },
+        "jerk_support":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_support_bottom":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_support_infill":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_support_interface":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_support_roof":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_topbottom":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_travel":
+        {
+            "minimum_value": 1,
+            "value": "jerk_print"
+        },
         "jerk_travel_enabled": { "value": false },
-        "jerk_wall": { "minimum_value_warning": 20 },
-        "jerk_wall_0": { "minimum_value_warning": 20 },
+        "jerk_travel_layer_0": { "minimum_value": 1 },
+        "jerk_wall":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_wall_0":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_wall_0_flooring":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_wall_0_roofing":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_wall_x":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_wall_x_flooring":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
+        "jerk_wall_x_roofing":
+        {
+            "minimum_value": 1,
+            "minimum_value_warning": 20
+        },
         "layer_height": { "value": 0.15 },
         "layer_height_0": { "value": "max(0.2, layer_height)" },
         "line_width": { "value": "machine_nozzle_size" },
@@ -84,7 +172,7 @@
         "material_standby_temperature":
         {
             "minimum_value": "0",
-            "value": "resolveOrValue('material_print_temperature') - 100"
+            "value": "material_print_temperature - 100"
         },
         "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" },
         "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" },