diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json
index 30c0abdab2..f5233124d6 100644
--- a/resources/definitions/dagoma_discoeasy200.def.json
+++ b/resources/definitions/dagoma_discoeasy200.def.json
@@ -7,8 +7,8 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "platform": "discoeasy200.stl",
-        "platform_offset": [ 105, -59, 280],
+        "platform": "dagoma_discoeasy200.stl",
+        "platform_offset": [0, -29, -11],
         "has_machine_quality": true,
         "has_materials": true,
         "machine_extruder_trains":
@@ -18,13 +18,13 @@
     },
     "overrides": {
         "machine_width": {
-            "default_value": 211
+            "default_value": 205
         },
         "machine_height": {
             "default_value": 205
         },
         "machine_depth": {
-            "default_value": 211
+            "default_value": 205
         },
         "machine_center_is_zero": {
             "default_value": false
diff --git a/resources/definitions/dagoma_discoultimate.def.json b/resources/definitions/dagoma_discoultimate.def.json
new file mode 100644
index 0000000000..42b24ffdd4
--- /dev/null
+++ b/resources/definitions/dagoma_discoultimate.def.json
@@ -0,0 +1,71 @@
+{
+    "name": "Dagoma DiscoUltimate",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Dagoma",
+        "manufacturer": "Dagoma",
+        "file_formats": "text/x-gcode",
+        "platform": "dagoma_discoultimate.stl",
+        "platform_offset": [0, -29.5, -11],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "machine_extruder_trains":
+        {
+            "0": "dagoma_discoultimate_extruder_0"
+        }
+    },
+    "overrides": {
+        "machine_width": {
+            "default_value": 205
+        },
+        "machine_height": {
+            "default_value": 205
+        },
+        "machine_depth": {
+            "default_value": 205
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [-17, -70],
+                [-17, 40],
+                [17, 40],
+                [17, -70]
+            ]
+        },
+        "gantry_height": {
+            "value": "10"
+        },
+        "machine_start_gcode": {
+            "default_value": ";Gcode by Cura\nG90\nM106 S255\nG28 X Y\nG1 X50\nM109 R90\nG28\nM104 S{material_print_temperature_layer_0}\nG29\nM107\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E10\nG92 E0\nG1 Z3\nG1 F6000\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 F3000\nG90\nG28 X Y\nM107\nM84\n"
+        },
+        "default_material_print_temperature": {
+            "default_value": 205
+        },
+        "speed_print": {
+            "default_value": 60
+        },
+        "retraction_amount": {
+            "default_value": 3.5
+        },
+        "retraction_speed": {
+            "default_value": 50
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "skirt_line_count": {
+            "default_value": 2
+        },
+        "layer_height_0": {
+            "default_value": 0.26
+        }
+    }
+}
diff --git a/resources/definitions/dagoma_magis.def.json b/resources/definitions/dagoma_magis.def.json
index dc5a0f86d2..b536afd0b5 100644
--- a/resources/definitions/dagoma_magis.def.json
+++ b/resources/definitions/dagoma_magis.def.json
@@ -7,8 +7,8 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "platform": "neva.stl",
-        "platform_offset": [ 0, 0, 0],
+        "platform": "dagoma_magis.stl",
+        "platform_offset": [0, -28, -35],
         "has_machine_quality": true,
         "has_materials": true,
         "machine_extruder_trains":
diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json
index 43a3e0c4f1..9d1e5b667a 100644
--- a/resources/definitions/dagoma_neva.def.json
+++ b/resources/definitions/dagoma_neva.def.json
@@ -7,8 +7,8 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "platform": "neva.stl",
-        "platform_offset": [ 0, 0, 0],
+        "platform": "dagoma_neva.stl",
+        "platform_offset": [0, -28, -35],
         "has_machine_quality": true,
         "has_materials": true,
         "machine_extruder_trains":
diff --git a/resources/extruders/dagoma_discoultimate_extruder_0.def.json b/resources/extruders/dagoma_discoultimate_extruder_0.def.json
new file mode 100644
index 0000000000..f55cb9fdab
--- /dev/null
+++ b/resources/extruders/dagoma_discoultimate_extruder_0.def.json
@@ -0,0 +1,21 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "dagoma_discoultimate",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        }
+    }
+}
diff --git a/resources/meshes/dagoma_discoeasy200.stl b/resources/meshes/dagoma_discoeasy200.stl
new file mode 100644
index 0000000000..3414816a27
Binary files /dev/null and b/resources/meshes/dagoma_discoeasy200.stl differ
diff --git a/resources/meshes/dagoma_discoultimate.stl b/resources/meshes/dagoma_discoultimate.stl
new file mode 100644
index 0000000000..f79d2a280f
Binary files /dev/null and b/resources/meshes/dagoma_discoultimate.stl differ
diff --git a/resources/meshes/dagoma_magis.stl b/resources/meshes/dagoma_magis.stl
new file mode 100644
index 0000000000..d09f8bd122
Binary files /dev/null and b/resources/meshes/dagoma_magis.stl differ
diff --git a/resources/meshes/dagoma_neva.stl b/resources/meshes/dagoma_neva.stl
new file mode 100644
index 0000000000..59dceb25dd
Binary files /dev/null and b/resources/meshes/dagoma_neva.stl differ
diff --git a/resources/meshes/discoeasy200.stl b/resources/meshes/discoeasy200.stl
deleted file mode 100644
index 381df45b24..0000000000
Binary files a/resources/meshes/discoeasy200.stl and /dev/null differ
diff --git a/resources/meshes/neva.stl b/resources/meshes/neva.stl
deleted file mode 100644
index 72ec185bd9..0000000000
Binary files a/resources/meshes/neva.stl and /dev/null differ