diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json
index 99abcccc47..2526261a3c 100644
--- a/resources/machines/ultimaker2plus.json
+++ b/resources/machines/ultimaker2plus.json
@@ -10,15 +10,12 @@
 
     "inherits": "ultimaker2.json",
 
-    "machine_settings": {
+    "overrides": {
         "machine_width": { "default": 230 },
         "machine_depth": { "default": 225 },
         "machine_height": { "default": 200 },
         "machine_show_variants": { "default": true },
-        "gantry_height": { "default": 50 }
-    },
-
-    "overrides": {
+        "gantry_height": { "default": 50 },
         "shell_thickness": { "default": 1.2 },
         "top_bottom_thickness": { "inherit_function": "(parent_value / 3) * 2" },
         "travel_compensate_overlapping_walls_enabled": { "default": true },
diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json
index fa3e76b7e9..3e59ac86dc 100644
--- a/resources/machines/ultimaker2plus_025.json
+++ b/resources/machines/ultimaker2plus_025.json
@@ -11,11 +11,9 @@
 
     "variant": "0.25mm Nozzle",
 
-    "machine_settings": {
-        "machine_nozzle_size": { "default": 0.25 }
-    },
-
     "overrides": {
+        "machine_nozzle_size": { "default": 0.25 },
+
         "layer_height": { "default": 0.06 },
         "layer_height_0": { "default": 0.15 },
 
diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json
index 36853be5ff..452559591b 100644
--- a/resources/machines/ultimaker2plus_040.json
+++ b/resources/machines/ultimaker2plus_040.json
@@ -11,11 +11,9 @@
 
     "variant": "0.40mm Nozzle",
 
-    "machine_settings": {
-        "machine_nozzle_size": { "default": 0.40 }
-    },
-
     "overrides": {
+        "machine_nozzle_size": { "default": 0.40 },
+
         "wall_line_width_0": { "inherit_function": "parent_value * 0.875" },
         "skin_line_width": { "inherit_function": "parent_value * 0.875" }
     }
diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json
index d047d565ee..0bfab6aecd 100644
--- a/resources/machines/ultimaker2plus_060.json
+++ b/resources/machines/ultimaker2plus_060.json
@@ -11,11 +11,9 @@
 
     "variant": "0.60mm Nozzle",
 
-    "machine_settings": {
-        "machine_nozzle_size": { "default": 0.60 }
-    },
-
     "overrides": {
+        "machine_nozzle_size": { "default": 0.60 },
+
         "layer_height": { "default": 0.15 },
         "layer_height_0": { "default": 0.4 },
 
diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json
index 2ac52e3a3f..b0f6376e9d 100644
--- a/resources/machines/ultimaker2plus_080.json
+++ b/resources/machines/ultimaker2plus_080.json
@@ -11,11 +11,9 @@
 
     "variant": "0.80mm Nozzle",
 
-    "machine_settings": {
-        "machine_nozzle_size": { "default": 0.80 }
-    },
-
     "overrides": {
+        "machine_nozzle_size": { "default": 0.80 },
+
         "layer_height": { "default": 0.2 },
         "layer_height_0": { "default": 0.5 },