diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h
index 634bb0610..37468f5aa 100644
--- a/src/main/target/ALIENFLIGHTNGF7/target.h
+++ b/src/main/target/ALIENFLIGHTNGF7/target.h
@@ -22,7 +22,6 @@
 #define USE_HARDWARE_REVISION_DETECTION
 #define HW_PIN                  PC13
 #define BRUSHED_ESC_AUTODETECT
-#define USE_DSHOT
 
 #define USBD_PRODUCT_STRING "AlienFlightNG F7"
 
diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h
index ebe3f5137..bbf000f32 100644
--- a/src/main/target/ANYFCF7/target.h
+++ b/src/main/target/ANYFCF7/target.h
@@ -21,7 +21,6 @@
 
 #define USBD_PRODUCT_STRING "AnyFCF7"
 
-#define USE_DSHOT
 #define USE_ESC_SENSOR
 
 #define LED0   PB7
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index 28b83ea9a..8855c40c0 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -138,8 +138,6 @@
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
-#define USE_ESC_TELEMETRY
-
 #define TARGET_IO_PORTA         0xffff
 #define TARGET_IO_PORTB         0xffff
 #define TARGET_IO_PORTC         0xffff
diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h
index 83de9e286..458aad7d4 100644
--- a/src/main/target/FURYF7/target.h
+++ b/src/main/target/FURYF7/target.h
@@ -21,7 +21,6 @@
 
 #define USBD_PRODUCT_STRING "FuryF7"
 
-#define USE_DSHOT
 #define USE_ESC_SENSOR
 
 #define LED0                    PB5
diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h
index f1210a36c..cc20cb1dc 100644
--- a/src/main/target/KIWIF4/target.h
+++ b/src/main/target/KIWIF4/target.h
@@ -135,8 +135,6 @@
 #define USE_ESCSERIAL
 #define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
 
-#define USE_DSHOT
-
 #define USE_SPI
 
 #define USE_SPI_DEVICE_1
diff --git a/src/main/target/NUCLEOF7/target.h b/src/main/target/NUCLEOF7/target.h
index 9ed24776e..ef50b450f 100644
--- a/src/main/target/NUCLEOF7/target.h
+++ b/src/main/target/NUCLEOF7/target.h
@@ -21,9 +21,6 @@
 
 #define USBD_PRODUCT_STRING "NucleoF7"
 
-//#define USE_DSHOT
-//#define USE_ESC_TELEMETRY
-
 #define LED0   PB7
 #define LED1   PB14
 
diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h
index a6ad814d7..75eb5a96a 100644
--- a/src/main/target/RG_SSD_F3/target.h
+++ b/src/main/target/RG_SSD_F3/target.h
@@ -139,8 +139,6 @@
 
 #define DEFAULT_RX_FEATURE FEATURE_RX_PPM
 
-#define USE_DSHOT
-#define USE_ESC_TELEMETRY
 #define REMAP_TIM16_DMA
 #define REMAP_TIM17_DMA
 #define ADC24_DMA_REMAP
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index 27e136378..d68f3d957 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -133,8 +133,6 @@
 #define VBAT_ADC_PIN            PC1
 #define RSSI_ADC_GPIO_PIN       PC0
 
-#define USE_ESC_TELEMETRY
-
 // Default configuration
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
diff --git a/src/main/target/common_fc_pre.h b/src/main/target/common_fc_pre.h
index c7b272f5c..0d2054ea0 100644
--- a/src/main/target/common_fc_pre.h
+++ b/src/main/target/common_fc_pre.h
@@ -50,6 +50,7 @@
 #endif
 
 #ifdef STM32F7
+#define USE_DSHOT
 #define I2C3_OVERCLOCK true
 #define I2C4_OVERCLOCK true
 #define TELEMETRY_IBUS