diff --git a/src/config b/src/config
index e3aaa6a827..96eebb9999 160000
--- a/src/config
+++ b/src/config
@@ -1 +1 @@
-Subproject commit e3aaa6a827c8a6215e70f373f83c3f57ae8abe64
+Subproject commit 96eebb999926be0769394f3105065f4e10472433
diff --git a/src/platform/APM32/mk/APM32F4.mk b/src/platform/APM32/mk/APM32F4.mk
index 508d4f95a7..2b1a09750d 100644
--- a/src/platform/APM32/mk/APM32F4.mk
+++ b/src/platform/APM32/mk/APM32F4.mk
@@ -184,9 +184,9 @@ MCU_COMMON_SRC = \
         common/stm32/bus_spi_hw.c \
         common/stm32/bus_spi_pinconfig.c \
         common/stm32/serial_uart_hw.c \
+        common/stm32/serial_uart_pinconfig.c \
         drivers/serial_escserial.c \
         drivers/serial_pinconfig.c \
-        drivers/serial_uart_pinconfig.c \
         APM32/system_apm32f4xx.c
 
 VCP_SRC = \
@@ -220,9 +220,9 @@ SIZE_OPTIMISED_SRC += \
         drivers/bus_spi_config.c \
         common/stm32/bus_i2c_pinconfig.c \
         common/stm32/bus_spi_pinconfig.c \
+        common/stm32/serial_uart_pinconfig.c \
         drivers/serial_escserial.c \
-        drivers/serial_pinconfig.c \
-        drivers/serial_uart_pinconfig.c
+        drivers/serial_pinconfig.c
 
 DSP_LIB := $(LIB_MAIN_DIR)/CMSIS/DSP
 DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM4 -DUSE_FULL_DDL_DRIVER
diff --git a/src/platform/AT32/mk/AT32F4.mk b/src/platform/AT32/mk/AT32F4.mk
index 4fc8e30726..8c8833e8c9 100644
--- a/src/platform/AT32/mk/AT32F4.mk
+++ b/src/platform/AT32/mk/AT32F4.mk
@@ -126,9 +126,9 @@ MCU_COMMON_SRC = \
             common/stm32/bus_spi_pinconfig.c \
             common/stm32/bus_spi_hw.c \
             common/stm32/serial_uart_hw.c \
+            common/stm32/serial_uart_pinconfig.c \
             drivers/serial_escserial.c \
             drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c \
             msc/usbd_storage.c \
             msc/usbd_storage_emfat.c \
             msc/emfat.c \
@@ -147,6 +147,6 @@ SIZE_OPTIMISED_SRC += \
             drivers/bus_spi_config.c \
             common/stm32/bus_i2c_pinconfig.c \
             common/stm32/bus_spi_pinconfig.c \
+            common/stm32/serial_uart_pinconfig.c \
             drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c
+            drivers/serial_pinconfig.c
diff --git a/src/platform/STM32/mk/STM32F4.mk b/src/platform/STM32/mk/STM32F4.mk
index adadafd80c..884d02ead7 100644
--- a/src/platform/STM32/mk/STM32F4.mk
+++ b/src/platform/STM32/mk/STM32F4.mk
@@ -206,8 +206,6 @@ MCU_COMMON_SRC = \
             STM32/camera_control_stm32.c \
             drivers/adc.c \
             drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c \
             STM32/startup/system_stm32f4xx.c
 
 SPEED_OPTIMISED_SRC += \
@@ -217,8 +215,7 @@ SPEED_OPTIMISED_SRC += \
 SIZE_OPTIMISED_SRC += \
             STM32/serial_usb_vcp.c \
             drivers/inverter.c \
-            drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c
+            drivers/serial_escserial.c
 
 ifeq ($(PERIPH_DRIVER), HAL)
 VCP_SRC = \
diff --git a/src/platform/STM32/mk/STM32F7.mk b/src/platform/STM32/mk/STM32F7.mk
index 0e90ff10a0..f0f67232dc 100644
--- a/src/platform/STM32/mk/STM32F7.mk
+++ b/src/platform/STM32/mk/STM32F7.mk
@@ -170,8 +170,6 @@ MCU_COMMON_SRC = \
             STM32/camera_control_stm32.c \
             drivers/adc.c \
             drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c \
             STM32/startup/system_stm32f7xx.c
 
 MSC_SRC = \
@@ -195,9 +193,7 @@ SIZE_OPTIMISED_SRC += \
             drivers/bus_i2c_timing.c \
             STM32/bus_i2c_hal_init.c \
             STM32/serial_usb_vcp.c \
-            drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c
+            drivers/serial_escserial.c
 
 DSP_LIB := $(LIB_MAIN_DIR)/CMSIS/DSP
 DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM7
diff --git a/src/platform/STM32/mk/STM32G4.mk b/src/platform/STM32/mk/STM32G4.mk
index 57e8dc51bd..3d232283f1 100644
--- a/src/platform/STM32/mk/STM32G4.mk
+++ b/src/platform/STM32/mk/STM32G4.mk
@@ -147,8 +147,6 @@ MCU_COMMON_SRC = \
             STM32/camera_control_stm32.c \
             drivers/adc.c \
             drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c \
             STM32/startup/system_stm32g4xx.c
 
 # G4's MSC use the same driver layer file with F7
@@ -169,9 +167,7 @@ SIZE_OPTIMISED_SRC += \
             drivers/bus_i2c_timing.c \
             STM32/bus_i2c_hal_init.c \
             STM32/serial_usb_vcp.c \
-            drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c
+            drivers/serial_escserial.c
 
 DSP_LIB := $(LIB_MAIN_DIR)/CMSIS/DSP
 DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM4
diff --git a/src/platform/STM32/mk/STM32H5.mk b/src/platform/STM32/mk/STM32H5.mk
index d708a4eb88..6695c5d569 100644
--- a/src/platform/STM32/mk/STM32H5.mk
+++ b/src/platform/STM32/mk/STM32H5.mk
@@ -169,8 +169,6 @@ MCU_COMMON_SRC = \
             STM32/system_stm32h5xx.c \
             drivers/adc.c \
             drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c \
             STM32/startup/system_stm32h5xx.c
 
 #            memprot_hal.c \
@@ -199,9 +197,7 @@ SIZE_OPTIMISED_SRC += \
             drivers/bus_i2c_timing.c \
             STM32/bus_i2c_hal_init.c \
             STM32/serial_usb_vcp.c \
-            drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c
+            drivers/serial_escserial.c
 
 DSP_LIB := $(LIB_MAIN_DIR)/CMSIS/DSP
 DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM7
diff --git a/src/platform/STM32/mk/STM32H7.mk b/src/platform/STM32/mk/STM32H7.mk
index 4a5c371d77..e8e2a4f90d 100644
--- a/src/platform/STM32/mk/STM32H7.mk
+++ b/src/platform/STM32/mk/STM32H7.mk
@@ -297,8 +297,6 @@ MCU_COMMON_SRC = \
             STM32/camera_control_stm32.c \
             drivers/adc.c \
             drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c \
             STM32/startup/system_stm32h7xx.c
 
 MSC_SRC = \
@@ -318,9 +316,7 @@ SIZE_OPTIMISED_SRC += \
             drivers/bus_i2c_timing.c \
             STM32/bus_i2c_hal_init.c \
             STM32/serial_usb_vcp.c \
-            drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart_pinconfig.c
+            drivers/serial_escserial.c
 
 DSP_LIB := $(LIB_MAIN_DIR)/CMSIS/DSP
 DEVICE_FLAGS += -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE -DARM_MATH_CM7
diff --git a/src/platform/STM32/mk/STM32_COMMON.mk b/src/platform/STM32/mk/STM32_COMMON.mk
index f300fd3b32..6b0c074964 100644
--- a/src/platform/STM32/mk/STM32_COMMON.mk
+++ b/src/platform/STM32/mk/STM32_COMMON.mk
@@ -6,10 +6,12 @@ MCU_COMMON_SRC += \
             common/stm32/config_flash.c \
             common/stm32/bus_spi_pinconfig.c \
             drivers/bus_spi_config.c \
+            drivers/serial_pinconfig.c \
             common/stm32/bus_i2c_pinconfig.c \
             common/stm32/bus_spi_hw.c \
             common/stm32/io_impl.c \
             common/stm32/serial_uart_hw.c \
+            common/stm32/serial_uart_pinconfig.c \
             common/stm32/dshot_dpwm.c \
             STM32/pwm_output_hw.c \
             common/stm32/pwm_output_dshot_shared.c \
@@ -17,9 +19,11 @@ MCU_COMMON_SRC += \
 
 SIZE_OPTIMISED_SRC += \
             drivers/bus_spi_config.c \
+            drivers/serial_pinconfig.c \
             common/stm32/bus_i2c_pinconfig.c \
             common/stm32/config_flash.c \
-            common/stm32/bus_spi_pinconfig.c
+            common/stm32/bus_spi_pinconfig.c \
+            common/stm32/serial_uart_pinconfig.c
 
 SPEED_OPTIMISED_SRC += \
             common/stm32/system.c \
diff --git a/src/main/drivers/serial_uart_pinconfig.c b/src/platform/common/stm32/serial_uart_pinconfig.c
similarity index 100%
rename from src/main/drivers/serial_uart_pinconfig.c
rename to src/platform/common/stm32/serial_uart_pinconfig.c