diff --git a/resources/definitions/modix_v3_base.def.json b/resources/definitions/modix_v3_base.def.json
index 4fa3866464..c365194a11 100644
--- a/resources/definitions/modix_v3_base.def.json
+++ b/resources/definitions/modix_v3_base.def.json
@@ -19,8 +19,8 @@
 	"overrides": {
         "machine_name": { "default_value": "Modix Base Printer" },
         "machine_start_gcode": { "default_value": "G28 ; home all axes"},
-        "machine_end_gcode": { "default_value": "G4 P200; wait\nG10 P0 S0 R0 ; turn off extruder0\n nG10 P1 S0 R0 ; turn off extruder1\n M107 ; turn off fan\n G91 ;relative positioning\n G1 Z2 F500 ; Move print head up\n G90 ; absolute positioning\n G28 XY ; home X and Y axis\n M84 ; disable motors" },
-		"machine_gcode_flavor": {"default_value": "RepRap (RepRap)"},
+        "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nG10 P1 S0 R0 ; turn off extruder 1 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors"},
+        "machine_gcode_flavor": {"default_value": "RepRap (RepRap)"},
 
         "material_diameter": { "default_value": 1.75 },
 		
diff --git a/resources/definitions/modix_v4_base.def.json b/resources/definitions/modix_v4_base.def.json
index 6b2236942b..d5aacde936 100644
--- a/resources/definitions/modix_v4_base.def.json
+++ b/resources/definitions/modix_v4_base.def.json
@@ -19,7 +19,7 @@
 	"overrides": {
         "machine_name": { "default_value": "Modix Base Printer" },
         "machine_start_gcode": { "default_value": "G28 ; home all axes"},
-        "machine_end_gcode": { "default_value": "G4 P200; wait\nG10 P0 S0 R0 ; turn off extruder0\n nG10 P1 S0 R0 ; turn off extruder1\n M107 ; turn off fan\n G91 ;relative positioning\n G1 Z2 F500 ; Move print head up\n G90 ; absolute positioning\n G28 XY ; home X and Y axis\n M84 ; disable motors" },
+        "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors"},
 		"machine_gcode_flavor": {"default_value": "RepRap (RepRap)"},
 
         "material_diameter": { "default_value": 1.75 },