diff --git a/resources/definitions/ultimaker_original_plus.def.json b/resources/definitions/ultimaker_original_plus.def.json
new file mode 100644
index 0000000000..830050beb0
--- /dev/null
+++ b/resources/definitions/ultimaker_original_plus.def.json
@@ -0,0 +1,26 @@
+{
+    "id": "ultimaker_original_plus",
+    "version": 2,
+    "name": "Ultimaker Original+",
+    "inherits": "ultimaker_original",
+    "metadata": {
+        "author": "Ultimaker",
+        "manufacturer": "Ultimaker",
+        "category": "Ultimaker",
+        "file_formats": "text/x-gcode",
+        "icon": "icon_ultimaker.png",
+        "platform": "ultimaker2_platform.obj",
+        "platform_texture": "UltimakerPlusbackplate.png",
+        "pages": [
+            "UpgradeFirmware",
+            "UltimakerCheckup",
+            "BedLeveling"
+        ]
+    },
+
+    "overrides": {
+        "machine_heated_bed": {
+            "default_value": true
+        }
+    }
+}
diff --git a/resources/machines/ultimaker_original_plus.json b/resources/machines/ultimaker_original_plus.json
deleted file mode 100644
index 07c5a04549..0000000000
--- a/resources/machines/ultimaker_original_plus.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "id": "ultimaker_original_plus",
-    "version": 1, 
-    "name": "Ultimaker Original+",
-    "manufacturer": "Ultimaker",
-    "author": "Ultimaker",
-    "icon": "icon_ultimaker.png",
-    "platform": "ultimaker2_platform.obj",
-    "platform_texture": "UltimakerPlusbackplate.png",
-    "file_formats": "text/x-gcode",
-    "inherits": "ultimaker_original.json",
-
-    "pages": [
-        "UpgradeFirmware",
-        "UltimakerCheckup",
-        "BedLeveling"
-    ],
-
-    "overrides": {
-        "machine_heated_bed": { "default": true }
-    }
-}