diff --git a/platformio.ini b/platformio.ini
index 163c6b7419..9f77af1afc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -629,8 +629,8 @@ lib_ignore  = LiquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, U8glib-H
 platform    = ststm32@>=6.1.0
 board       = malyanm300_f070cb
 build_flags = ${common.build_flags}
-    -DUSBCON -DUSBD_VID=0x0483 "-DUSB_MANUFACTURER=\"Unknown\"" "-DUSB_PRODUCT=\"MALYAN_M300\""
-    -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED
+  -DUSBCON -DUSBD_VID=0x0483 "-DUSB_MANUFACTURER=\"Unknown\"" "-DUSB_PRODUCT=\"MALYAN_M300\""
+  -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED
 src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
 lib_ignore  = LiquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, U8glib-HAL
 
@@ -656,10 +656,10 @@ platform          = ststm32
 board             = STEVAL_STM32F401VE
 platform_packages = framework-arduinoststm32@>=3.10700,<4
 build_flags       = ${common.build_flags}
- -DTARGET_STM32F4 -DARDUINO_STEVAL -DSTM32F401xE
- -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STEVAL_F401VE\"
- -DDISABLE_GENERIC_SERIALUSB -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
- -IMarlin/src/HAL/STM32
+  -DTARGET_STM32F4 -DARDUINO_STEVAL -DSTM32F401xE
+  -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STEVAL_F401VE\"
+  -DDISABLE_GENERIC_SERIALUSB -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py
@@ -715,10 +715,10 @@ platform          = ststm32
 board             = blackSTM32F407VET6
 platform_packages = framework-arduinoststm32@>=3.10700,<4
 build_flags       = ${common.build_flags}
- -DTARGET_STM32F4 -DARDUINO_BLACK_F407VE
- -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"BLACK_F407VE\"
- -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
- -IMarlin/src/HAL/STM32
+  -DTARGET_STM32F4 -DARDUINO_BLACK_F407VE
+  -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"BLACK_F407VE\"
+  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SlowSoftI2CMaster, SoftwareSerial
@@ -749,7 +749,6 @@ debug_init_break  =
 #
 [env:BIGTREE_GTR_V1_0]
 platform          = ststm32@>=5.7.0
-framework         = arduino
 platform_packages = framework-arduinoststm32@>=3.10700,<4
 board             = BigTree_SKR_Pro
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -766,7 +765,6 @@ lib_deps          =
   Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/dev.zip
 lib_ignore        = SoftwareSerial, SoftwareSerialM
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
-monitor_speed     = 250000
 
 #
 # BigTreeTech BTT002 V1.0 (STM32F407VGT6 ARM Cortex-M4)
@@ -890,8 +888,8 @@ upload_protocol = dfu
 platform      = ststm32
 board         = rumba32_f446ve
 build_flags   = ${common.build_flags}
- -DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""
- -DSTM32F446xx -DUSBCON -DUSBD_VID=0x8000
+  -DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""
+  -DSTM32F446xx -DUSBCON -DUSBD_VID=0x8000
   "-DUSB_MANUFACTURER=\"Unknown\""
   "-DUSB_PRODUCT=\"RUMBA32_F446VE\""
   -DHAL_PCD_MODULE_ENABLED