diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c
index 39e99d53d7..0f952bb64b 100755
--- a/src/main/fc/cli.c
+++ b/src/main/fc/cli.c
@@ -507,7 +507,7 @@ const clivalue_t valueTable[] = {
     { "input_filtering_mode",       VAR_INT8   | MASTER_VALUE | MODE_LOOKUP,  &pwmConfig()->inputFilteringMode, .config.lookup = { TABLE_OFF_ON } },
 #endif
     { "fpv_mix_degrees",            VAR_UINT8  | MASTER_VALUE,  &rxConfig()->fpvCamAngleDegrees, .config.minmax = { 0,  50 } },
-    { "max_aux_channels",           VAR_UINT8  | MASTER_VALUE,  &rxConfig()->max_aux_channel, .config.minmax = { 0,  MAX_AUX_CHANNELS } },
+    { "max_aux_channels",           VAR_UINT8  | MASTER_VALUE,  &rxConfig()->max_aux_channel, .config.minmax = { 0,  MAX_AUX_CHANNEL_COUNT } },
     { "debug_mode",                 VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP,  &masterConfig.debug_mode, .config.lookup = { TABLE_DEBUG } },
 
     { "min_throttle",               VAR_UINT16 | MASTER_VALUE,  &motorConfig()->minthrottle, .config.minmax = { PWM_RANGE_ZERO,  PWM_RANGE_MAX } },
diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index 6a78dbe837..d9b6245c8c 100755
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -710,7 +710,7 @@ void createDefaultConfig(master_t *config)
     config->rxConfig.rcInterpolationChannels = 0;
     config->rxConfig.rcInterpolationInterval = 19;
     config->rxConfig.fpvCamAngleDegrees = 0;
-    config->rxConfig.max_aux_channel = MAX_AUX_CHANNELS;
+    config->rxConfig.max_aux_channel = DEFAULT_AUX_CHANNEL_COUNT;
     config->rxConfig.airModeActivateThreshold = 1350;
 
     resetAllRxChannelRangeConfigurations(config->rxConfig.channelRanges);
diff --git a/src/main/target/common.h b/src/main/target/common.h
index 38e562c186..65eb2bd9de 100644
--- a/src/main/target/common.h
+++ b/src/main/target/common.h
@@ -31,7 +31,6 @@
 #define I2C2_OVERCLOCK true
 
 #ifdef STM32F7
-#define STM_FAST_TARGET
 #define I2C3_OVERCLOCK true
 #define I2C4_OVERCLOCK true
 #define TELEMETRY_IBUS
@@ -41,7 +40,6 @@
   STM32 F4 specific settings.
 ****************************/
 #ifdef STM32F4
-#define STM_FAST_TARGET
 #define USE_DSHOT
 #define I2C3_OVERCLOCK true
 #define TELEMETRY_IBUS
@@ -73,16 +71,20 @@
 #define USE_PWM
 #define USE_PPM
 
-#if defined(STM_FAST_TARGET)
-#define MAX_AUX_CHANNELS                20
+#if defined(STM32F4) || defined(STM32F7)
 #define TASK_GYROPID_DESIRED_PERIOD     125
 #define SCHEDULER_DELAY_LIMIT           10
 #else
-#define MAX_AUX_CHANNELS                6
 #define TASK_GYROPID_DESIRED_PERIOD     1000
 #define SCHEDULER_DELAY_LIMIT           100
 #endif
 
+#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
+#define DEFAULT_AUX_CHANNEL_COUNT       MAX_AUX_CHANNEL_COUNT
+#else
+#define DEFAULT_AUX_CHANNEL_COUNT       6
+#endif
+
 #if (FLASH_SIZE > 64)
 #define BLACKBOX
 #define GPS