diff --git a/src/main/target/FRSKYF3/config.c b/src/main/target/FRSKYF3/config.c
index e51c480500..c051a5ac14 100644
--- a/src/main/target/FRSKYF3/config.c
+++ b/src/main/target/FRSKYF3/config.c
@@ -25,9 +25,17 @@
 #include "rx/rx.h"
 #include "io/serial.h"
 
+#include "config_helper.h"
+
+#define TELEMETRY_UART          SERIAL_PORT_USART3
+
+static targetSerialPortFunction_t targetSerialPortFunction[] = {
+    { TELEMETRY_UART, FUNCTION_TELEMETRY_SMARTPORT },
+};
+
 void targetConfiguration(void)
 {
-    serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
+    targetSerialPortFunctionConfig(targetSerialPortFunction, ARRAYLEN(targetSerialPortFunction));
     rxConfigMutable()->rssi_channel = 8;
 }
 #endif
diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h
index 0f379c5859..9dc9f52906 100644
--- a/src/main/target/FRSKYF3/target.h
+++ b/src/main/target/FRSKYF3/target.h
@@ -131,7 +131,6 @@
 #define DEFAULT_FEATURES        ( FEATURE_TELEMETRY | FEATURE_LED_STRIP | FEATURE_OSD)
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
-#define TELEMETRY_UART          SERIAL_PORT_USART3
 #define SERIALRX_UART           SERIAL_PORT_USART2
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
diff --git a/src/main/target/FRSKYF4/config.c b/src/main/target/FRSKYF4/config.c
index e51c480500..50b11db79a 100644
--- a/src/main/target/FRSKYF4/config.c
+++ b/src/main/target/FRSKYF4/config.c
@@ -25,9 +25,17 @@
 #include "rx/rx.h"
 #include "io/serial.h"
 
+#include "config_helper.h"
+
+#define TELEMETRY_UART          SERIAL_PORT_USART6
+
+static targetSerialPortFunction_t targetSerialPortFunction[] = {
+    { TELEMETRY_UART, FUNCTION_TELEMETRY_SMARTPORT },
+};
+
 void targetConfiguration(void)
 {
-    serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
+    targetSerialPortFunctionConfig(targetSerialPortFunction, ARRAYLEN(targetSerialPortFunction));
     rxConfigMutable()->rssi_channel = 8;
 }
 #endif
diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h
index e57439125a..c68d30d0f8 100644
--- a/src/main/target/FRSKYF4/target.h
+++ b/src/main/target/FRSKYF4/target.h
@@ -122,7 +122,6 @@
 #define DEFAULT_FEATURES        (FEATURE_OSD)
 #define AVOID_UART1_FOR_PWM_PPM
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
-#define TELEMETRY_UART          SERIAL_PORT_USART6
 #define SERIALRX_UART           SERIAL_PORT_USART1
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
diff --git a/src/main/target/KAKUTEF4/config.c b/src/main/target/KAKUTEF4/config.c
index 4383b474b0..95f78f8e65 100644
--- a/src/main/target/KAKUTEF4/config.c
+++ b/src/main/target/KAKUTEF4/config.c
@@ -30,10 +30,17 @@
 
 #include "telemetry/telemetry.h"
 
+#include "config_helper.h"
+
+#define TELEMETRY_UART          SERIAL_PORT_USART1
+
+static targetSerialPortFunction_t targetSerialPortFunction[] = {
+    { TELEMETRY_UART, FUNCTION_TELEMETRY_SMARTPORT },
+};
 
 void targetConfiguration(void)
 {
-    serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
+    targetSerialPortFunctionConfig(targetSerialPortFunction, ARRAYLEN(targetSerialPortFunction));
     telemetryConfigMutable()->halfDuplex = 0;
     telemetryConfigMutable()->telemetry_inverted = true;
 }
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index d89d7525e9..34f7545514 100644
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -148,7 +148,6 @@
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
 #define SERIALRX_UART           SERIAL_PORT_USART3
-#define TELEMETRY_UART          SERIAL_PORT_USART1
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
diff --git a/src/main/target/NUCLEOF446RE/config.c b/src/main/target/NUCLEOF446RE/config.c
index 45bac0ce41..2253856595 100644
--- a/src/main/target/NUCLEOF446RE/config.c
+++ b/src/main/target/NUCLEOF446RE/config.c
@@ -21,18 +21,17 @@
 
 #ifdef USE_TARGET_CONFIG
 
-
 #include "io/serial.h"
 
+#include "config_helper.h"
+
+static targetSerialPortFunction_t targetSerialPortFunction[] = {
+    { SERIAL_PORT_USART1, FUNCTION_MSP },
+    { SERIAL_PORT_USART2, FUNCTION_MSP },
+};
 
 void targetConfiguration(void)
 {
-
-    serialConfigMutable()->portConfigs[0].functionMask = FUNCTION_MSP;
-    serialConfigMutable()->portConfigs[1].functionMask = FUNCTION_MSP;
-    serialConfigMutable()->portConfigs[2].functionMask = FUNCTION_MSP;
-
-
-
+    targetSerialPortFunctionConfig(targetSerialPortFunction, ARRAYLEN(targetSerialPortFunction));
 }
 #endif
diff --git a/src/main/target/SPRACINGF4EVO/config.c b/src/main/target/SPRACINGF4EVO/config.c
index 8877341b42..cec67662e2 100644
--- a/src/main/target/SPRACINGF4EVO/config.c
+++ b/src/main/target/SPRACINGF4EVO/config.c
@@ -32,12 +32,19 @@
 
 #include "telemetry/telemetry.h"
 
+#include "config_helper.h"
+
+#define TELEMETRY_UART                      SERIAL_PORT_UART5
+
+static targetSerialPortFunction_t targetSerialPortFunction[] = {
+    { SERIAL_PORT_USART1, FUNCTION_MSP                 },  // So SPRacingF3OSD users don't have to change anything.
+    { TELEMETRY_UART,     FUNCTION_TELEMETRY_SMARTPORT },
+};
 
 void targetConfiguration(void)
 {
     barometerConfigMutable()->baro_hardware = BARO_DEFAULT;
-    serialConfigMutable()->portConfigs[1].functionMask = FUNCTION_MSP; // So SPRacingF3OSD users don't have to change anything.
-    serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
+    targetSerialPortFunctionConfig(targetSerialPortFunction, ARRAYLEN(targetSerialPortFunction));
     telemetryConfigMutable()->halfDuplex = 0;
     telemetryConfigMutable()->telemetry_inverted = true;
 }
diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h
index 054b8bad51..be9dbbda56 100644
--- a/src/main/target/SPRACINGF4EVO/target.h
+++ b/src/main/target/SPRACINGF4EVO/target.h
@@ -206,7 +206,6 @@
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
 #define DEFAULT_FEATURES        (FEATURE_TRANSPONDER | FEATURE_RSSI_ADC | FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_LED_STRIP)
 #define SERIALRX_UART           SERIAL_PORT_USART2
-#define TELEMETRY_UART          SERIAL_PORT_UART5
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
diff --git a/src/main/target/SPRACINGF4NEO/config.c b/src/main/target/SPRACINGF4NEO/config.c
index e30445d597..e915f0e1a7 100644
--- a/src/main/target/SPRACINGF4NEO/config.c
+++ b/src/main/target/SPRACINGF4NEO/config.c
@@ -28,11 +28,21 @@
 
 #include "fc/config.h"
 
+#include "config_helper.h"
+
+#define GPS_UART                            SERIAL_PORT_USART3
+#define TELEMETRY_UART                      SERIAL_PORT_UART5
+#define TELEMETRY_PROVIDER_DEFAULT          FUNCTION_TELEMETRY_SMARTPORT
+
+static targetSerialPortFunction_t targetSerialPortFunction[] = {
+    { GPS_UART,           FUNCTION_GPS },
+    { TELEMETRY_UART,     TELEMETRY_PROVIDER_DEFAULT },
+};
+
 #ifdef USE_TARGET_CONFIG
 void targetConfiguration(void)
 {
-    serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(GPS_UART)].functionMask = FUNCTION_GPS;
-    serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = TELEMETRY_PROVIDER_DEFAULT;
+    targetSerialPortFunctionConfig(targetSerialPortFunction, ARRAYLEN(targetSerialPortFunction));
     telemetryConfigMutable()->halfDuplex = false;
 }
 #endif
diff --git a/src/main/target/SPRACINGF7DUAL/config.c b/src/main/target/SPRACINGF7DUAL/config.c
index 5722fcaf8f..1f40d73234 100644
--- a/src/main/target/SPRACINGF7DUAL/config.c
+++ b/src/main/target/SPRACINGF7DUAL/config.c
@@ -49,12 +49,23 @@
 #include "fc/config.h"
 
 #ifdef USE_TARGET_CONFIG
+
+#include "config_helper.h"
+
+#define TELEMETRY_UART                      SERIAL_PORT_UART5
+
+#ifdef USE_TELEMETRY
+static targetSerialPortFunction_t targetSerialPortFunction[] = {
+    { TELEMETRY_UART, FUNCTION_TELEMETRY_SMARTPORT },
+};
+#endif
+
 void targetConfiguration(void)
 {
     barometerConfigMutable()->baro_hardware = BARO_DEFAULT;
-    serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
 
 #ifdef USE_TELEMETRY
+    targetSerialPortFunctionConfig(targetSerialPortFunction, ARRAYLEN(targetSerialPortFunction));
     // change telemetry settings
     telemetryConfigMutable()->telemetry_inverted = 1;
     telemetryConfigMutable()->halfDuplex = 1;
diff --git a/src/main/target/SPRACINGF7DUAL/target.h b/src/main/target/SPRACINGF7DUAL/target.h
index f4127e88b3..0af35b072a 100644
--- a/src/main/target/SPRACINGF7DUAL/target.h
+++ b/src/main/target/SPRACINGF7DUAL/target.h
@@ -215,9 +215,6 @@
 #define SERIALRX_UART                       SERIAL_PORT_USART2
 #define SERIALRX_PROVIDER                   SERIALRX_SBUS
 
-#define TELEMETRY_UART                      SERIAL_PORT_UART5
-#define TELEMETRY_PROVIDER_DEFAULT          FUNCTION_TELEMETRY_SMARTPORT
-
 #define SPEKTRUM_BIND_PIN       UART2_RX_PIN
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE