diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json
index ffc3d7a43e..85311e72b3 100644
--- a/resources/definitions/inat_base.def.json
+++ b/resources/definitions/inat_base.def.json
@@ -26,57 +26,46 @@
             "default_value": "G28 ;Home\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\n"
         },
         "machine_end_gcode": {
-            "default_value": "M400\nM104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X R5\nG0 Y300 F2000\nM84\n"
+            "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X R5\nG0 Y300 F2000\nM84\n"
         },
         "material_diameter": {
-            "value": 1.75
-        },
-        "machine_width": {
-            "value": 304
-        },
-        "machine_depth": {
-            "value": 304
+            "default_value": 1.75
         },
         "machine_shape": {
-            "value": "rectangular"
-        },
-        "machine_height": {
-            "value": 430
+            "default_value": "rectangular"
         },
         "machine_heated_bed": {
-            "value": true
+            "default_value": true
         },
         "machine_heated_build_volume": {
-            "value": false
+            "default_value": false
         },
         "machine_gcode_flavor": {
-            "value": "RepRap (Marlin/Sprinter)"
+            "default_value": "RepRap (Marlin/Sprinter)"
         },
         "machine_head_with_fans_polygon": {
-            "value": [
+            "default_value": [
                 [
-                    -20,
-                    10
+                    -86,
+                    66
                 ],
                 [
-                    10,
-                    10
+                    44,
+                    66
                 ],
                 [
-                    10,
-                    -10
+                    44,
+                    -96
                 ],
                 [
-                    -20,
-                    -10
+                    -86,
+                    -96
                 ]
             ]
         },
-        "gantry_height": {
-            "value": 99999999999
-        },
+        "gantry_height": { "default_value": 34 },
         "machine_nozzle_size": {
-            "value": 0.4
+            "default_value": 0.4
         },
         "machine_max_feedrate_x": {
             "value": 200
diff --git a/resources/definitions/inat_proton_x_rail.def.json b/resources/definitions/inat_proton_x_rail.def.json
index b9df88ff4d..5af4957538 100644
--- a/resources/definitions/inat_proton_x_rail.def.json
+++ b/resources/definitions/inat_proton_x_rail.def.json
@@ -10,32 +10,22 @@
         "platform_offset": [ 0, 0, 0]
     },
     "overrides": {
-        "machine_name": { "value": "Proton X" },
-        "machine_width": { "value": 304 },
-        "machine_depth": { "value": 304 },
-        "machine_height": { "value": 650 },
-        "machine_head_with_fans_polygon": {
-            "value": [
-                [
-                    -86,
-                    66
-                ],
-                [
-                    44,
-                    66
-                ],
-                [
-                    44,
-                    -96
-                ],
-                [
-                    -86,
-                    -96
-                ]
-            ]
+        "machine_name": { "default_value": "Proton X Rail" },
+        "machine_width": { "default_value": 304 },
+        "machine_depth": { "default_value": 304 },
+        "machine_height": { "default_value": 650 },
+        "machine_max_acceleration_x": {
+            "value": 500
         },
-
-        "gantry_height": { "value": 34 }
+        "machine_max_acceleration_y": {
+            "value": 800
+        },
+        "machine_max_acceleration_z": {
+            "value": 200
+        },
+        "machine_max_jerk_xy": {
+            "value": 10
+        }
 
     }
 }
\ No newline at end of file
diff --git a/resources/definitions/inat_proton_x_rod.def.json b/resources/definitions/inat_proton_x_rod.def.json
index a5a7143677..bef1a6cf2f 100644
--- a/resources/definitions/inat_proton_x_rod.def.json
+++ b/resources/definitions/inat_proton_x_rod.def.json
@@ -10,32 +10,9 @@
         "platform_offset": [ 0, 0, 0]
     },
     "overrides": {
-        "machine_name": { "value": "Proton X" },
-        "machine_width": { "value": 304 },
-        "machine_depth": { "value": 304 },
-        "machine_height": { "value": 650 },
-        "machine_head_with_fans_polygon": {
-            "value": [
-                [
-                    -86,
-                    66
-                ],
-                [
-                    44,
-                    66
-                ],
-                [
-                    44,
-                    -96
-                ],
-                [
-                    -86,
-                    -96
-                ]
-            ]
-        },
-
-        "gantry_height": { "value": 34 }
-
+        "machine_name": { "default_value": "Proton X Rod" },
+        "machine_width": { "default_value": 304 },
+        "machine_depth": { "default_value": 304 },
+        "machine_height": { "default_value": 650 }
     }
 }
\ No newline at end of file
diff --git a/resources/quality/inat/inat_base_standard.inst.cfg b/resources/quality/inat/inat_base_standard.inst.cfg
index f9ab645030..3ebf52796b 100644
--- a/resources/quality/inat/inat_base_standard.inst.cfg
+++ b/resources/quality/inat/inat_base_standard.inst.cfg
@@ -11,5 +11,4 @@ weight = 0
 global_quality = True
 
 [values]
-layer_height = 0.2
 speed_print = 80
diff --git a/resources/quality/inat/inat_base_strong.inst.cfg b/resources/quality/inat/inat_base_strong.inst.cfg
index 07b583cff1..4032d7751a 100644
--- a/resources/quality/inat/inat_base_strong.inst.cfg
+++ b/resources/quality/inat/inat_base_strong.inst.cfg
@@ -11,7 +11,6 @@ weight = -3
 global_quality = True
 
 [values]
-layer_height = 0.2
 speed_print = 50
 speed_layer_0 = 20
 wall_thickness = =8*wall_line_width
diff --git a/resources/quality/inat/inat_base_tree_support.inst.cfg b/resources/quality/inat/inat_base_tree_support.inst.cfg
index ad7b2a334e..09794b9b72 100644
--- a/resources/quality/inat/inat_base_tree_support.inst.cfg
+++ b/resources/quality/inat/inat_base_tree_support.inst.cfg
@@ -11,7 +11,6 @@ weight = -2
 global_quality = True
 
 [values]
-layer_height = 0.2
 support_structure = tree
 support_type = buildplate
 support_enable = True