diff --git a/.github/workflows/ci-build-tests.yml b/.github/workflows/ci-build-tests.yml
index 546faa5f38f6f..ff214d51148bb 100644
--- a/.github/workflows/ci-build-tests.yml
+++ b/.github/workflows/ci-build-tests.yml
@@ -108,7 +108,7 @@ jobs:
         - BIGTREE_GTR_V1_0
         - BIGTREE_SKR_PRO
         - FLYF407ZG
-        - FYSETC_S6
+        - STM32F446VE_fysetc
         - LERDGEK
         - LERDGEX
         - mks_robin_pro2
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index a9349910d79c4..dc1805085eeba 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -767,13 +767,13 @@
 #elif MB(LERDGE_X)
   #include "stm32f4/pins_LERDGE_X.h"                // STM32F4                              env:LERDGEX env:LERDGEX_usb_flash_drive
 #elif MB(FYSETC_S6)
-  #include "stm32f4/pins_FYSETC_S6.h"               // STM32F4                              env:FYSETC_S6 env:FYSETC_S6_8000
+  #include "stm32f4/pins_FYSETC_S6.h"               // STM32F4                              env:STM32F446VE_fysetc env:STM32F446VE_fysetc_32k_bootloader
 #elif MB(FYSETC_S6_V2_0)
-  #include "stm32f4/pins_FYSETC_S6_V2_0.h"          // STM32F4                              env:FYSETC_S6 env:FYSETC_S6_8000
+  #include "stm32f4/pins_FYSETC_S6_V2_0.h"          // STM32F4                              env:STM32F446VE_fysetc env:STM32F446VE_fysetc_32k_bootloader
 #elif MB(FYSETC_SPIDER)
-  #include "stm32f4/pins_FYSETC_SPIDER.h"           // STM32F4                              env:FYSETC_S6 env:FYSETC_S6_8000
+  #include "stm32f4/pins_FYSETC_SPIDER.h"           // STM32F4                              env:STM32F446VE_fysetc env:STM32F446VE_fysetc_32k_bootloader
 #elif MB(FYSETC_SPIDER_V2_2)
-  #include "stm32f4/pins_FYSETC_SPIDER_V2_2.h"      // STM32F4                              env:FYSETC_S6 env:FYSETC_S6_8000
+  #include "stm32f4/pins_FYSETC_SPIDER_V2_2.h"      // STM32F4                              env:STM32F446VE_fysetc_32k_bootloader
 #elif MB(FLYF407ZG)
   #include "stm32f4/pins_FLYF407ZG.h"               // STM32F4                              env:FLYF407ZG
 #elif MB(MKS_ROBIN2)
diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index 5ccfd1df558e5..7b2886bf68779 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -133,7 +133,7 @@ lp9|lpc9) TESTENV='LPC1769' ;;
       f1) TESTENV='STM32F103RE' ;;
       f4) TESTENV='STM32F4' ;;
       f7) TESTENV='STM32F7' ;;
-      s6) TESTENV='FYSETC_S6' ;;
+      s6) TESTENV='STM32F446VE_fysetc' ;;
   teensy) TESTENV='teensy31' ;;
      t31) TESTENV='teensy31' ;;
      t32) TESTENV='teensy31' ;;
diff --git a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json b/buildroot/share/PlatformIO/boards/marlin_STM32F446VE_fysetc.json
similarity index 85%
rename from buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
rename to buildroot/share/PlatformIO/boards/marlin_STM32F446VE_fysetc.json
index 286e46ffbd202..bbeefdf9779a4 100644
--- a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
+++ b/buildroot/share/PlatformIO/boards/marlin_STM32F446VE_fysetc.json
@@ -3,14 +3,14 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DSTM32F446xx",
     "f_cpu": "180000000L",
-    "mcu": "stm32f446ret6",
-    "variant": "MARLIN_FYSETC_S6"
+    "mcu": "stm32f446vet6",
+    "variant": "MARLIN_F446VE_FYSETC"
   },
   "connectivity": [
     "can"
   ],
   "debug": {
-    "jlink_device": "STM32F446RE",
+    "jlink_device": "STM32F446VE",
     "openocd_target": "stm32f4x",
     "svd_path": "STM32F446x.svd"
   },
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/PeripheralPins.c
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PeripheralPins.c
rename to buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/PeripheralPins.c
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/PinNamesVar.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PinNamesVar.h
rename to buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/PinNamesVar.h
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/ldscript.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
rename to buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/ldscript.ld
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/variant.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.cpp
rename to buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/variant.cpp
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/variant.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h
rename to buildroot/share/PlatformIO/variants/MARLIN_F446VE_FYSETC/variant.h
diff --git a/buildroot/tests/FYSETC_S6 b/buildroot/tests/STM32F446VE_fysetc
similarity index 95%
rename from buildroot/tests/FYSETC_S6
rename to buildroot/tests/STM32F446VE_fysetc
index 9043b7b6e3833..d7d10d0bb7074 100755
--- a/buildroot/tests/FYSETC_S6
+++ b/buildroot/tests/STM32F446VE_fysetc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Build tests for FYSETC_S6
+# Build tests for STM32F446VE_fysetc
 #
 
 # exit on first failure
diff --git a/ini/renamed.ini b/ini/renamed.ini
index 85f2df2862731..8387e04dfc1be 100644
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -98,3 +98,9 @@ extends = renamed
 
 [env:STM32F446_tronxy]                ;=> TRONXY_CXY_446_V10
 extends = renamed
+
+[env:FYSETC_S6]                       ;=> STM32F446VE_fysetc
+extends = renamed
+
+[env:FYSETC_S6_8000]                  ;=> STM32F446VE_fysetc_32k_bootloader
+extends = renamed
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 9c6f751746c35..a5ae1eba843e9 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -60,11 +60,11 @@ board_build.offset  = 0x8000
 upload_protocol     = dfu
 
 #
-# FYSETC S6 (STM32F446RET6 ARM Cortex-M4)
+# FYSETC S6 / Spider V1.x/2.x/3.x with 64k bootloader (STM32F446VET6 ARM Cortex-M4)
 #
-[env:FYSETC_S6]
+[env:STM32F446VE_fysetc]
 extends                     = stm32_variant
-board                       = marlin_fysetc_s6
+board                       = marlin_STM32F446VE_fysetc
 board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
 build_flags                 = ${stm32_variant.build_flags} -DHAL_PCD_MODULE_ENABLED
@@ -73,11 +73,14 @@ upload_protocol             = dfu
 upload_command              = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
 
 #
-# FYSETC S6 new bootloader
+# FYSETC S6 / Spider V1.x/2.x/3.x with 32k bootloader
+# All S6 & Spider (V2.2+) boards made after 2021/06/23 use this bootloader
+# S6 - https://github.com/FYSETC/FYSETC-S6/tree/main/bootloader
+# Spider - https://github.com/FYSETC/FYSETC-SPIDER/tree/main/bootloader
 #
-[env:FYSETC_S6_8000]
-extends                     = env:FYSETC_S6
-board                       = marlin_fysetc_s6
+[env:STM32F446VE_fysetc_32k_bootloader]
+extends                     = env:STM32F446VE_fysetc
+board                       = marlin_STM32F446VE_fysetc
 board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
 upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"