diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json
index 6deeba5c6fd..32dbf75b020 100644
--- a/resources/definitions/creality_ender5s1.def.json
+++ b/resources/definitions/creality_ender5s1.def.json
@@ -1,15 +1,21 @@
 {
-    "name": "Creality Ender-5 S1",
     "version": 2,
+    "name": "Creality Ender-5 S1",
     "inherits": "creality_base",
-    "metadata": {
-        "quality_definition": "creality_base",
-        "visible": true
+    "metadata":
+    {
+        "visible": true,
+        "quality_definition": "creality_base"
     },
-    "overrides": {
+    "overrides":
+    {
+        "build_volume_temperature": { "value": 195 },
+        "cool_min_layer_time": { "value": 5 },
         "gantry_height": { "value": 25 },
         "machine_depth": { "default_value": 225 },
-        "machine_head_with_fans_polygon": { 
+        "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
+        "machine_head_with_fans_polygon":
+        {
             "default_value": [
                 [-26, 34],
                 [-26, -32],
@@ -19,16 +25,13 @@
         },
         "machine_height": { "default_value": 305 },
         "machine_name": { "default_value": "Creality Ender-5 S1" },
-        "machine_width": { "default_value": 225 },    
-        "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
-		"build_volume_temperature": { "value": 195 },
-		"material_bed_temperature": { "value": 60 },
-		"retraction_amount": { "value": 2},
-		"z_seam_type": { "value": "'sharpest_corner'" },
-		"support_z_distance": { "value": 0.25 },
-		"cool_min_layer_time": { "value": 5 },
-		"wall_thickness": {"value": "line_width * 3" },
-		"retraction_speed": { "value": 45 },
-        "speed_print": { "value": 80.0 }
+        "machine_width": { "default_value": 225 },
+        "material_bed_temperature": { "value": 60 },
+        "retraction_amount": { "value": 2 },
+        "retraction_speed": { "value": 45 },
+        "speed_print": { "value": 80.0 },
+        "support_z_distance": { "value": 0.25 },
+        "wall_thickness": { "value": "line_width * 3" },
+        "z_seam_type": { "value": "'sharpest_corner'" }
     }
 }
\ No newline at end of file
diff --git a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg
index b5969358e6f..bb3e5312eab 100644
--- a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg
+++ b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender5s1
 name = 0.2mm Nozzle
 version = 4
-definition = creality_ender5s1
 
 [metadata]
+hardware_type = nozzle
 setting_version = 22
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.2
+
diff --git a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg
index c8314bda4da..f7aa3350bc6 100644
--- a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg
+++ b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender5s1
 name = 0.3mm Nozzle
 version = 4
-definition = creality_ender5s1
 
 [metadata]
+hardware_type = nozzle
 setting_version = 22
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.3
+
diff --git a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg
index 1b519ad1211..6e38f503fcb 100644
--- a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg
+++ b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender5s1
 name = 0.4mm Nozzle
 version = 4
-definition = creality_ender5s1
 
 [metadata]
+hardware_type = nozzle
 setting_version = 22
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.4
+
diff --git a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg
index 6bc413f30bb..cb2b6845426 100644
--- a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg
+++ b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender5s1
 name = 0.5mm Nozzle
 version = 4
-definition = creality_ender5s1
 
 [metadata]
+hardware_type = nozzle
 setting_version = 22
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.5
+
diff --git a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg
index f2356509112..2c2d0480ff6 100644
--- a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg
+++ b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender5s1
 name = 0.6mm Nozzle
 version = 4
-definition = creality_ender5s1
 
 [metadata]
+hardware_type = nozzle
 setting_version = 22
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.6
+
diff --git a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg
index 52b16eea23d..2e95f8e3d00 100644
--- a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg
+++ b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender5s1
 name = 0.8mm Nozzle
 version = 4
-definition = creality_ender5s1
 
 [metadata]
+hardware_type = nozzle
 setting_version = 22
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.8
+
diff --git a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg
index 06c558c42bf..48fba7a715b 100644
--- a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg
+++ b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender5s1
 name = 1.0mm Nozzle
 version = 4
-definition = creality_ender5s1
 
 [metadata]
+hardware_type = nozzle
 setting_version = 22
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 1.0
+