diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3c610b875..abc1ec2d56 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -95,7 +95,6 @@ jobs:
         - "electronut_labs_blip"
         - "electronut_labs_papyr"
         - "escornabot_makech"
-        - "feather_f405"
         - "feather_m0_adalogger"
         - "feather_m0_basic"
         - "feather_m0_express"
@@ -106,6 +105,7 @@ jobs:
         - "feather_m4_express"
         - "feather_nrf52840_express"
         - "feather_radiofruit_zigbee"
+        - "feather_stm32f405_express"
         - "gemma_m0"
         - "grandcentral_m4_express"
         - "hallowing_m0_express"
diff --git a/ports/stm32f4/Makefile b/ports/stm32f4/Makefile
index 4b660f244f..2727ea954f 100755
--- a/ports/stm32f4/Makefile
+++ b/ports/stm32f4/Makefile
@@ -121,7 +121,7 @@ LIBS += -lm
 endif
 
 # TinyUSB defines
-CFLAGS += -DHSE_VALUE=8000000 -DCFG_TUSB_MCU=OPT_MCU_STM32F4 -DCFG_TUD_CDC_RX_BUFSIZE=1024 -DCFG_TUD_CDC_TX_BUFSIZE=1024 -DCFG_TUD_MSC_BUFSIZE=4096 -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_TUD_MIDI_TX_BUFSIZE=128
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_STM32F4 -DCFG_TUD_CDC_RX_BUFSIZE=1024 -DCFG_TUD_CDC_TX_BUFSIZE=1024 -DCFG_TUD_MSC_BUFSIZE=4096 -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_TUD_MIDI_TX_BUFSIZE=128
 
 
 ######################################
diff --git a/ports/stm32f4/boards/feather_f405/board.c b/ports/stm32f4/boards/feather_stm32f405_express/board.c
similarity index 100%
rename from ports/stm32f4/boards/feather_f405/board.c
rename to ports/stm32f4/boards/feather_stm32f405_express/board.c
diff --git a/ports/stm32f4/boards/feather_f405/mpconfigboard.h b/ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.h
similarity index 96%
rename from ports/stm32f4/boards/feather_f405/mpconfigboard.h
rename to ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.h
index 831a17573a..d795342dd8 100644
--- a/ports/stm32f4/boards/feather_f405/mpconfigboard.h
+++ b/ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.h
@@ -27,7 +27,7 @@
 
 //Micropython setup
 
-#define MICROPY_HW_BOARD_NAME       "Feather F405"
+#define MICROPY_HW_BOARD_NAME       "Feather STM32F405 Express"
 #define MICROPY_HW_MCU_NAME         "STM32F405RG"
 
 #define FLASH_SIZE                  (0x100000)
diff --git a/ports/stm32f4/boards/feather_f405/mpconfigboard.mk b/ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.mk
similarity index 85%
rename from ports/stm32f4/boards/feather_f405/mpconfigboard.mk
rename to ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.mk
index 789dc0f05d..5bad4e81f3 100644
--- a/ports/stm32f4/boards/feather_f405/mpconfigboard.mk
+++ b/ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.mk
@@ -1,6 +1,6 @@
 USB_VID = 0x239A
 USB_PID = 0x805A
-USB_PRODUCT = "Feather F405"
+USB_PRODUCT = "Feather STM32F405 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 USB_DEVICES = "CDC,MSC"
 
diff --git a/ports/stm32f4/boards/feather_f405/pins.c b/ports/stm32f4/boards/feather_stm32f405_express/pins.c
similarity index 100%
rename from ports/stm32f4/boards/feather_f405/pins.c
rename to ports/stm32f4/boards/feather_stm32f405_express/pins.c
diff --git a/ports/stm32f4/boards/feather_f405/stm32f4xx_hal_conf.h b/ports/stm32f4/boards/feather_stm32f405_express/stm32f4xx_hal_conf.h
similarity index 100%
rename from ports/stm32f4/boards/feather_f405/stm32f4xx_hal_conf.h
rename to ports/stm32f4/boards/feather_stm32f405_express/stm32f4xx_hal_conf.h