diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 2655093be5..f390cbb21a 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -65,14 +65,14 @@ CIRCUITPY_BLEIO = 1
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_IMAGECAPTURE = 0
 CIRCUITPY_PARALLELDISPLAY = 0
+CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
 
 else ifeq ($(IDF_TARGET),esp32s2)
 # No BLE on S2
 CIRCUITPY_BLEIO = 0
 CIRCUITPY_BLEIO_HCI = 0
-endif
-
 CIRCUITPY_BUILD_EXTENSIONS ?= bin,uf2
+endif
 
 # From ESP32-S2/S3 Technical Reference Manual:
 #
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 6d4ff8bbe8..65e39ee99d 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -1,7 +1,5 @@
 # All raspberrypi ports have longints.
 LONGINT_IMPL = MPZ
-CIRCUITPY_BUILD_EXTENSIONS ?= uf2
-CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
 
 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
 CIRCUITPY_ALARM ?= 1
@@ -38,6 +36,8 @@ CIRCUITPY_AUDIOMIXER = 1
 
 INTERNAL_LIBM = 1
 
+CIRCUITPY_BUILD_EXTENSIONS ?= uf2
+
 # Number of USB endpoint pairs.
 USB_NUM_ENDPOINT_PAIRS = 8
 
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index 1628925a89..9705dcd0a0 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -1,8 +1,6 @@
 LONGINT_IMPL ?= MPZ
 INTERNAL_LIBM ?= 1
 
-CIRCUITPY_BUILD_EXTENSIONS ?= bin
-
 ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx))
         CIRCUITPY_ALARM = 1
         CIRCUITPY_CANIO = 1
@@ -90,3 +88,4 @@ ifeq ($(MCU_SERIES),L4)
 endif
 
 CIRCUITPY_PARALLELDISPLAY := 0
+CIRCUITPY_BUILD_EXTENSIONS ?= bin