diff --git a/buildroot/share/PlatformIO/boards/at90usb1286.json b/buildroot/share/PlatformIO/boards/at90usb1286.json
index 63c9ce44d..3282722b0 100644
--- a/buildroot/share/PlatformIO/boards/at90usb1286.json
+++ b/buildroot/share/PlatformIO/boards/at90usb1286.json
@@ -8,6 +8,7 @@
   "frameworks": [
     "arduino"
   ],
+  "platform": "teensy",
   "name": "Atmel AT90USB1286 based",
   "upload": {
     "maximum_ram_size": 8192,
diff --git a/buildroot/share/PlatformIO/boards/malyanM200.json b/buildroot/share/PlatformIO/boards/malyanM200.json
index ccf118512..dc0cf51f9 100644
--- a/buildroot/share/PlatformIO/boards/malyanM200.json
+++ b/buildroot/share/PlatformIO/boards/malyanM200.json
@@ -15,54 +15,12 @@
     "vec_tab_addr": "0x8002000"
   },
   "debug": {
-    "tools": {
-      "stlink": {
-        "server": {
-          "arguments": [
-            "-f", "scripts/interface/stlink.cfg",
-            "-c", "transport select hla_swd",
-            "-f", "scripts/target/stm32f1x.cfg",
-            "-c", "reset_config none"
-          ],
-          "executable": "bin/openocd",
-          "package": "tool-openocd"
-        }
-      },
-      "stlink-v2": {
-        "server": {
-          "package": "tool-openocd",
-          "executable": "bin/openocd",
-          "arguments": [
-            "-f", "scripts/interface/stlink-v2.cfg",
-            "-c", "transport select hla_swd",
-            "-f", "scripts/target/stm32f1x.cfg"
-          ]
-        },
-        "default": true
-      },
-      "stlink-v2-1": {
-        "server": {
-          "package": "tool-openocd",
-          "executable": "bin/openocd",
-          "arguments": [
-            "-f", "scripts/interface/stlink-v2-1.cfg",
-            "-c", "transport select hla_swd",
-            "-f", "scripts/target/stm32f1x.cfg"
-          ]
-        }
-      },
-      "blackmagic": {
-        "hwids": [
-          [
-            "0x1d50",
-            "0x6018"
-          ]
-        ],
-        "require_debug_port": true
-      }
-    }
+    "jlink_device": "STM32F103CB",
+    "openocd_target": "stm32f1x",
+    "svd_path": "STM32F103xx.svd"
   },
-  "frameworks": ["arduino", "arduinoSTM32GENERIC"],
+  "platform": "ststm32",
+  "frameworks": ["arduino"],
   "name": "Malyan STM32F103CB (20k RAM. 128k Flash)",
   "upload": {
     "disable_flushing": false,
diff --git a/buildroot/share/PlatformIO/boards/malyanM200v2.json b/buildroot/share/PlatformIO/boards/malyanM200v2.json
index ca768444b..0d2090a93 100644
--- a/buildroot/share/PlatformIO/boards/malyanM200v2.json
+++ b/buildroot/share/PlatformIO/boards/malyanM200v2.json
@@ -8,6 +8,7 @@
     "vec_tab_addr": "0x8002000"
   },
   "debug": {
+    "jlink_device": "STM32F070RB",
     "default_tools": [
       "stlink"
     ],
@@ -17,10 +18,11 @@
     "openocd_board": "st_nucleo_f0",
     "openocd_target": "stm32f0x"
   },
+  "platform": "ststm32",
   "frameworks": [
     "mbed",
     "stm32cube",
-    "arduinoSTM32GENERIC"
+    "arduino"
   ],
   "name": "Malyan M200 V2/Delta",
   "upload": {