diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json
index 63d7a4318b..5cff33a791 100644
--- a/resources/definitions/peopoly_moai.def.json
+++ b/resources/definitions/peopoly_moai.def.json
@@ -14,7 +14,9 @@
     },
 
     "overrides": {
-        "machine_name": { "default_value": "Moai" },
+        "machine_name": {
+            "default_value": "Moai"
+        },
         "machine_width": {
             "default_value": 130
         },
@@ -70,7 +72,8 @@
         },
         "layer_height_0": {
             "maximum_value_warning": "0.5",
-            "minimum_value_warning": "0.02"
+            "minimum_value_warning": "0.02",
+            "value": "0.1"
         },
         "top_bottom_thickness": {
             "minimum_value_warning": "0.1"
@@ -85,16 +88,31 @@
             "maximum_value_warning": "300"
         },
         "speed_wall": {
-            "maximum_value_warning": "300"
+            "maximum_value_warning": "300",
+            "value": "speed_print"
         },
         "speed_wall_0": {
             "maximum_value_warning": "300"
         },
         "speed_wall_x": {
-            "maximum_value_warning": "300"
+            "maximum_value_warning": "300",
+            "value": "speed_print"
         },
         "speed_topbottom": {
-            "maximum_value_warning": "300"
+            "maximum_value_warning": "300",
+            "value": "speed_print"
+        },
+        "speed_travel": {
+            "value": "300"
+        },
+        "speed_travel_layer_0": {
+            "value": "300"
+        },
+        "speed_layer_0": {
+            "value": "5"
+        },
+        "speed_slowdown_layers": {
+            "value": "2"
         },
 
         "acceleration_enabled": {
diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg
index 789e383b19..27848d4301 100644
--- a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg
+++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg
@@ -11,14 +11,6 @@ quality_type = high
 [values]
 infill_sparse_density = 70
 layer_height = 0.05
-layer_height_0 = 0.1
 top_bottom_thickness = 0.4
 wall_thickness = 0.4
-speed_layer_0 = 5
 speed_print = 150
-speed_slowdown_layers = 2
-speed_topbottom = 150
-speed_travel = 300
-speed_travel_layer_0 = 300
-speed_wall = 150
-speed_wall_x = 150
diff --git a/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg
index f622511715..253070569f 100644
--- a/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg
+++ b/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg
@@ -11,14 +11,6 @@ quality_type = extra_high
 [values]
 infill_sparse_density = 70
 layer_height = 0.025
-layer_height_0 = 0.1
 top_bottom_thickness = 0.4
 wall_thickness = 0.4
-speed_layer_0 = 5
 speed_print = 200
-speed_slowdown_layers = 2
-speed_topbottom = 200
-speed_travel = 300
-speed_travel_layer_0 = 300
-speed_wall = 200
-speed_wall_x = 200
diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg
index 890c73d7e6..c4ff8360fa 100644
--- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg
+++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg
@@ -11,14 +11,6 @@ quality_type = normal
 [values]
 infill_sparse_density = 70
 layer_height = 0.1
-layer_height_0 = 0.1
 top_bottom_thickness = 0.4
 wall_thickness = 0.4
-speed_layer_0 = 5
 speed_print = 100
-speed_slowdown_layers = 2
-speed_topbottom = 100
-speed_travel = 300
-speed_travel_layer_0 = 300
-speed_wall = 100
-speed_wall_x = 100