diff --git a/src/main/target/AIKONF4/target.h b/src/main/target/AIKONF4/target.h
index 6e77fde6ad..d0e13b8a12 100644
--- a/src/main/target/AIKONF4/target.h
+++ b/src/main/target/AIKONF4/target.h
@@ -103,6 +103,7 @@
 #define TEMPERATURE_I2C_BUS     DEFAULT_I2C_BUS
 #define PITOT_I2C_BUS           DEFAULT_I2C_BUS
 #define PCA9685_I2C_BUS         DEFAULT_I2C_BUS
+#define BNO055_I2C_BUS          DEFAULT_I2C_BUS
 
 #define DEFAULT_RX_TYPE         RX_TYPE_SERIAL
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
diff --git a/src/main/target/AIRBOTF4/target.h b/src/main/target/AIRBOTF4/target.h
index edf6973b54..596a0b54fd 100644
--- a/src/main/target/AIRBOTF4/target.h
+++ b/src/main/target/AIRBOTF4/target.h
@@ -64,8 +64,8 @@
 
 #define USE_PITOT_ADC
 #define PITOT_I2C_BUS           BUS_I2C2
-
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 #define M25P16_CS_PIN           PB3
 #define M25P16_SPI_BUS          BUS_SPI3
diff --git a/src/main/target/AIRBOTF7/target.h b/src/main/target/AIRBOTF7/target.h
index 8b4a267710..4a554cdd56 100644
--- a/src/main/target/AIRBOTF7/target.h
+++ b/src/main/target/AIRBOTF7/target.h
@@ -79,7 +79,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
-
+#define BNO055_I2C_BUS          BUS_I2C1
 #define PITOT_I2C_BUS           BUS_I2C1
 
 #define USE_RANGEFINDER
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index 0cae3b81cb..9d7718d640 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -64,6 +64,7 @@
 #define MAG_MPU9250_ALIGN       CW0_DEG
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C1
diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h
index 45e4fe08d9..0a4522d312 100644
--- a/src/main/target/ALIENFLIGHTNGF7/target.h
+++ b/src/main/target/ALIENFLIGHTNGF7/target.h
@@ -66,6 +66,7 @@
 #define AK8963_SPI_BUS          BUS_SPI3
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C1
diff --git a/src/main/target/ANYFC/target.h b/src/main/target/ANYFC/target.h
index cfd82fc9c7..ad5fdf17a7 100644
--- a/src/main/target/ANYFC/target.h
+++ b/src/main/target/ANYFC/target.h
@@ -53,6 +53,7 @@
 
 #define USE_RANGEFINDER
 #define RANGEFINDER_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C1
diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h
index 16baaca9cc..1e6d6c9f42 100644
--- a/src/main/target/ANYFCF7/target.h
+++ b/src/main/target/ANYFCF7/target.h
@@ -49,6 +49,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 #define USE_BARO
 
diff --git a/src/main/target/ANYFCM7/target.h b/src/main/target/ANYFCM7/target.h
index ca42a0ad2e..07e09434a1 100644
--- a/src/main/target/ANYFCM7/target.h
+++ b/src/main/target/ANYFCM7/target.h
@@ -49,6 +49,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C2
diff --git a/src/main/target/ASGARD32F4/target.h b/src/main/target/ASGARD32F4/target.h
index 49c8dd10c3..d9018a5cd9 100644
--- a/src/main/target/ASGARD32F4/target.h
+++ b/src/main/target/ASGARD32F4/target.h
@@ -168,3 +168,4 @@
 #define PITOT_I2C_BUS           BUS_I2C2
 #define PCA9685_I2C_BUS         BUS_I2C2
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
diff --git a/src/main/target/ASGARD32F7/target.h b/src/main/target/ASGARD32F7/target.h
index f26650eeeb..97e2ad210e 100644
--- a/src/main/target/ASGARD32F7/target.h
+++ b/src/main/target/ASGARD32F7/target.h
@@ -172,3 +172,4 @@
 
 #define PCA9685_I2C_BUS         BUS_I2C2
 #define PITOT_I2C_BUS           BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h
index 7f7ed3dea6..7963cae436 100644
--- a/src/main/target/BEEROTORF4/target.h
+++ b/src/main/target/BEEROTORF4/target.h
@@ -56,6 +56,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_OSD
 #define USE_MAX7456
diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h
index cf4727c7b3..0b33a58755 100755
--- a/src/main/target/BETAFLIGHTF4/target.h
+++ b/src/main/target/BETAFLIGHTF4/target.h
@@ -130,6 +130,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 #define USE_BARO
 #define BARO_I2C_BUS             BUS_I2C2
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index 06cca4cf11..321b5e280a 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -53,6 +53,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C1
diff --git a/src/main/target/CLRACINGF4AIR/target.h b/src/main/target/CLRACINGF4AIR/target.h
index 2b8f3c0145..e5f5aa5a4f 100644
--- a/src/main/target/CLRACINGF4AIR/target.h
+++ b/src/main/target/CLRACINGF4AIR/target.h
@@ -116,6 +116,7 @@
 #define I2C2_SDA                PB11
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 #endif
 
 #define USE_ADC
diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h
index d852c19a06..eff71edd24 100755
--- a/src/main/target/COLIBRI/target.h
+++ b/src/main/target/COLIBRI/target.h
@@ -56,6 +56,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C3
+#define BNO055_I2C_BUS          BUS_I2C3
 
 #ifdef QUANTON
 #define IMU_MPU6000_ALIGN       CW90_DEG
diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
index 57e6a98eee..8347b58cd3 100755
--- a/src/main/target/COLIBRI_RACE/target.h
+++ b/src/main/target/COLIBRI_RACE/target.h
@@ -124,4 +124,5 @@
 #define TARGET_IO_PORTD         (BIT(2))
 #define TARGET_IO_PORTF         (BIT(0)|BIT(1)|BIT(4))
 
-#define PCA9685_I2C_BUS         BUS_I2C2
\ No newline at end of file
+#define PCA9685_I2C_BUS         BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
\ No newline at end of file
diff --git a/src/main/target/DALRCF405/target.h b/src/main/target/DALRCF405/target.h
index b478f8e238..0b37dc2c11 100644
--- a/src/main/target/DALRCF405/target.h
+++ b/src/main/target/DALRCF405/target.h
@@ -96,6 +96,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_HCSR04_I2C
diff --git a/src/main/target/DALRCF722DUAL/target.h b/src/main/target/DALRCF722DUAL/target.h
index 534042b8da..ca29604c6c 100644
--- a/src/main/target/DALRCF722DUAL/target.h
+++ b/src/main/target/DALRCF722DUAL/target.h
@@ -82,7 +82,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
-
+#define BNO055_I2C_BUS          BUS_I2C1
 #define PITOT_I2C_BUS           BUS_I2C1
 
 #define USE_SPI
diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h
index 6c2ebc7925..6dbb58442f 100644
--- a/src/main/target/F4BY/target.h
+++ b/src/main/target/F4BY/target.h
@@ -56,6 +56,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C2
diff --git a/src/main/target/FALCORE/target.h b/src/main/target/FALCORE/target.h
index d8480eda73..cdb8ba4636 100755
--- a/src/main/target/FALCORE/target.h
+++ b/src/main/target/FALCORE/target.h
@@ -135,4 +135,5 @@
 #define TARGET_IO_PORTD         0xFFFF
 #define TARGET_IO_PORTF         (BIT(0)|BIT(1)|BIT(4))
 
-#define PCA9685_I2C_BUS         BUS_I2C2
\ No newline at end of file
+#define PCA9685_I2C_BUS         BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
\ No newline at end of file
diff --git a/src/main/target/FF_F35_LIGHTNING/target.h b/src/main/target/FF_F35_LIGHTNING/target.h
index d2285e8a38..73e3e0fee9 100644
--- a/src/main/target/FF_F35_LIGHTNING/target.h
+++ b/src/main/target/FF_F35_LIGHTNING/target.h
@@ -127,6 +127,7 @@
 #define PITOT_I2C_BUS           BUS_I2C1
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define DEFAULT_FEATURES        (FEATURE_TX_PROF_SEL | FEATURE_VBAT | FEATURE_CURRENT_METER | FEATURE_OSD | FEATURE_GPS | FEATURE_TELEMETRY)
 
diff --git a/src/main/target/FIREWORKSV2/target.h b/src/main/target/FIREWORKSV2/target.h
index c3818458fd..a0ea4428da 100644
--- a/src/main/target/FIREWORKSV2/target.h
+++ b/src/main/target/FIREWORKSV2/target.h
@@ -231,6 +231,8 @@
 
 #if defined(OMNIBUSF4V6)
 #define PCA9685_I2C_BUS         BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 #else
 #define PCA9685_I2C_BUS         BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 #endif
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index 91fd29491b..40c0fd199e 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -65,6 +65,8 @@
 // *************** Temperature sensor *****************
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
 
+#define BNO055_I2C_BUS          BUS_I2C1
+
 // *************** BARO *****************************
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C1
diff --git a/src/main/target/FLYWOOF411/target.h b/src/main/target/FLYWOOF411/target.h
index 675513def2..34d110d7a5 100644
--- a/src/main/target/FLYWOOF411/target.h
+++ b/src/main/target/FLYWOOF411/target.h
@@ -76,6 +76,8 @@
 #define USE_BARO_BMP280
 #define USE_BARO_MS5611
 
+#define BNO055_I2C_BUS          BUS_I2C1
+
 #define USE_MAG
 #define MAG_I2C_BUS             BUS_I2C1
 #define USE_MAG_HMC5883
diff --git a/src/main/target/FLYWOOF7DUAL/target.h b/src/main/target/FLYWOOF7DUAL/target.h
index 419d5ba9e4..10b8d285bb 100644
--- a/src/main/target/FLYWOOF7DUAL/target.h
+++ b/src/main/target/FLYWOOF7DUAL/target.h
@@ -113,6 +113,8 @@
 #define USE_BARO_BMP280
 #define USE_BARO_MS5611
 
+#define BNO055_I2C_BUS          BUS_I2C1
+
 #define USE_MAG
 #define MAG_I2C_BUS             BUS_I2C1
 #define USE_MAG_HMC5883
diff --git a/src/main/target/FOXEERF405/target.h b/src/main/target/FOXEERF405/target.h
index c4c38aa3c7..2b8d4e2ac0 100644
--- a/src/main/target/FOXEERF405/target.h
+++ b/src/main/target/FOXEERF405/target.h
@@ -117,6 +117,8 @@
 #define USE_MAG_MAG3110
 #define USE_MAG_LIS3MDL
 
+#define BNO055_I2C_BUS          BUS_I2C1
+
 /*** ADC ***/
 #define USE_ADC
 #define ADC_CHANNEL_1_PIN               PC0
diff --git a/src/main/target/FOXEERF722DUAL/target.h b/src/main/target/FOXEERF722DUAL/target.h
index e1ac91c271..b339cef7a9 100644
--- a/src/main/target/FOXEERF722DUAL/target.h
+++ b/src/main/target/FOXEERF722DUAL/target.h
@@ -125,6 +125,8 @@
 #define USE_MAG_MAG3110
 #define USE_MAG_LIS3MDL
 
+#define BNO055_I2C_BUS          BUS_I2C1
+
 /*** ADC ***/
 #define USE_ADC
 #define ADC_CHANNEL_1_PIN               PC0
diff --git a/src/main/target/FRSKYPILOT/target.h b/src/main/target/FRSKYPILOT/target.h
index a92057f4ee..87bd0b072b 100644
--- a/src/main/target/FRSKYPILOT/target.h
+++ b/src/main/target/FRSKYPILOT/target.h
@@ -123,7 +123,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C3
-
+#define BNO055_I2C_BUS          BUS_I2C3
 #define PITOT_I2C_BUS           BUS_I2C3
 
 #define USE_RANGEFINDER
diff --git a/src/main/target/FRSKY_ROVERF7/target.h b/src/main/target/FRSKY_ROVERF7/target.h
index 30955d0bfd..6347cd9bd9 100755
--- a/src/main/target/FRSKY_ROVERF7/target.h
+++ b/src/main/target/FRSKY_ROVERF7/target.h
@@ -66,7 +66,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
-
+#define BNO055_I2C_BUS          BUS_I2C1
 #define PITOT_I2C_BUS           BUS_I2C1
 
 // *************** SPI2 Flash ***********************
diff --git a/src/main/target/FURYF4OSD/target.h b/src/main/target/FURYF4OSD/target.h
index c445959610..d5ccf15a95 100644
--- a/src/main/target/FURYF4OSD/target.h
+++ b/src/main/target/FURYF4OSD/target.h
@@ -134,6 +134,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS         DEFAULT_I2C_BUS
+#define BNO055_I2C_BUS              DEFAULT_I2C_BUS
 
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_MSP
diff --git a/src/main/target/HGLRCF722/target.h b/src/main/target/HGLRCF722/target.h
index c745a853be..440a657c1b 100644
--- a/src/main/target/HGLRCF722/target.h
+++ b/src/main/target/HGLRCF722/target.h
@@ -80,7 +80,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
-
+#define BNO055_I2C_BUS          BUS_I2C1
 #define PITOT_I2C_BUS           BUS_I2C1
 
 #define USE_RANGEFINDER
diff --git a/src/main/target/IFLIGHTF4_SUCCEXD/target.h b/src/main/target/IFLIGHTF4_SUCCEXD/target.h
index e47b9c7638..aee436548c 100644
--- a/src/main/target/IFLIGHTF4_SUCCEXD/target.h
+++ b/src/main/target/IFLIGHTF4_SUCCEXD/target.h
@@ -112,6 +112,7 @@
 
 #define PITOT_I2C_BUS           BUS_I2C1
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_MSP
diff --git a/src/main/target/IFLIGHTF4_TWING/target.h b/src/main/target/IFLIGHTF4_TWING/target.h
index cbb9d29428..ab5d0bf5f3 100644
--- a/src/main/target/IFLIGHTF4_TWING/target.h
+++ b/src/main/target/IFLIGHTF4_TWING/target.h
@@ -79,6 +79,7 @@
 #define RANGEFINDER_I2C_BUS     BUS_I2C1
 
 #define PCA9685_I2C_BUS         BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 // *************** OSD *****************************
 #define USE_SPI_DEVICE_2
diff --git a/src/main/target/IFLIGHTF7_TWING/target.h b/src/main/target/IFLIGHTF7_TWING/target.h
index bac28ceea0..2fb765bce7 100644
--- a/src/main/target/IFLIGHTF7_TWING/target.h
+++ b/src/main/target/IFLIGHTF7_TWING/target.h
@@ -80,6 +80,7 @@
 
 #define USE_RANGEFINDER
 #define RANGEFINDER_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 // *************** FLASH **************************
 #define M25P16_CS_PIN           PB9
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index 80013075a3..134889a0f3 100755
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -65,6 +65,7 @@
 #   define USE_MAG_LIS3MDL
 
 #   define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS             BUS_I2C1
 
 #   define USE_BARO
 #   define BARO_I2C_BUS            BUS_I2C1
diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h
index 0889e6d94f..da8f8c9d1a 100644
--- a/src/main/target/KAKUTEF7/target.h
+++ b/src/main/target/KAKUTEF7/target.h
@@ -180,6 +180,4 @@
 
 #define MAX_PWM_OUTPUT_PORTS       6
 
-#define USE_SECONDARY_IMU
-#define USE_IMU_BNO055
 #define BNO055_I2C_BUS          BUS_I2C1
\ No newline at end of file
diff --git a/src/main/target/KAKUTEF7MINIV3/target.h b/src/main/target/KAKUTEF7MINIV3/target.h
index a32f9655c9..7ecc7a3d1e 100644
--- a/src/main/target/KAKUTEF7MINIV3/target.h
+++ b/src/main/target/KAKUTEF7MINIV3/target.h
@@ -167,6 +167,7 @@
 #define RANGEFINDER_I2C_BUS         BUS_I2C1
 #define TEMPERATURE_I2C_BUS         BUS_I2C1
 #define PITOT_I2C_BUS               BUS_I2C1
+#define BNO055_I2C_BUS              BUS_I2C1
 
 /*** Used pins ***/
 #define TARGET_IO_PORTA         0xffff
diff --git a/src/main/target/MAMBAF405US/target.h b/src/main/target/MAMBAF405US/target.h
index f4312c06fc..f1ca6b7b00 100644
--- a/src/main/target/MAMBAF405US/target.h
+++ b/src/main/target/MAMBAF405US/target.h
@@ -56,6 +56,8 @@
 #define USE_BARO_BMP280
 #define USE_BARO_MS5611
 
+#define BNO055_I2C_BUS                  BUS_I2C2
+
 //*********** Magnetometer / Compass *************
 #define USE_MAG
 #define MAG_I2C_BUS                     DEFAULT_I2C_BUS
diff --git a/src/main/target/MAMBAF722/target.h b/src/main/target/MAMBAF722/target.h
index aa324c685c..20bb2e4873 100644
--- a/src/main/target/MAMBAF722/target.h
+++ b/src/main/target/MAMBAF722/target.h
@@ -56,6 +56,8 @@
 #define USE_BARO_BMP280
 #define USE_BARO_MS5611
 
+#define BNO055_I2C_BUS                  BUS_I2C2
+
 //*********** Magnetometer / Compass *************
 #define USE_MAG
 #define MAG_I2C_BUS                     DEFAULT_I2C_BUS
diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h
index 37e7f78096..a70cc55583 100644
--- a/src/main/target/MATEKF405/target.h
+++ b/src/main/target/MATEKF405/target.h
@@ -162,6 +162,8 @@
 
 #define TEMPERATURE_I2C_BUS         DEFAULT_I2C_BUS
 
+#define BNO055_I2C_BUS              DEFAULT_I2C_BUS
+
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_MSP
 #define USE_RANGEFINDER_HCSR04_I2C
diff --git a/src/main/target/MATEKF405CAN/target.h b/src/main/target/MATEKF405CAN/target.h
index 057bf922e4..f2c0999ee8 100644
--- a/src/main/target/MATEKF405CAN/target.h
+++ b/src/main/target/MATEKF405CAN/target.h
@@ -75,6 +75,7 @@
 #define PITOT_I2C_BUS           BUS_I2C2
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
 #define PCA9685_I2C_BUS         BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 
 // *************** SPI2 RM3100 **************************
diff --git a/src/main/target/MATEKF405SE/target.h b/src/main/target/MATEKF405SE/target.h
index 81681b94f5..79fc334751 100644
--- a/src/main/target/MATEKF405SE/target.h
+++ b/src/main/target/MATEKF405SE/target.h
@@ -73,10 +73,9 @@
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_HCSR04_I2C
 #define RANGEFINDER_I2C_BUS     BUS_I2C2
-
 #define PITOT_I2C_BUS           BUS_I2C2
-
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 
 // *************** SPI2 OSD ***************************
diff --git a/src/main/target/MATEKF411/target.h b/src/main/target/MATEKF411/target.h
index b12f1e596a..ac6962a350 100755
--- a/src/main/target/MATEKF411/target.h
+++ b/src/main/target/MATEKF411/target.h
@@ -121,6 +121,7 @@
 #define USE_BARO_DPS310
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_MAG
 #define MAG_I2C_BUS             BUS_I2C1
diff --git a/src/main/target/MATEKF411SE/target.h b/src/main/target/MATEKF411SE/target.h
index de42b9c1eb..59d59e42de 100755
--- a/src/main/target/MATEKF411SE/target.h
+++ b/src/main/target/MATEKF411SE/target.h
@@ -113,6 +113,7 @@
 
 #define PITOT_I2C_BUS           BUS_I2C1
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_MSP
diff --git a/src/main/target/MATEKF722/target.h b/src/main/target/MATEKF722/target.h
index 317074b45b..331ad65821 100755
--- a/src/main/target/MATEKF722/target.h
+++ b/src/main/target/MATEKF722/target.h
@@ -160,6 +160,4 @@
 #define USE_ESC_SENSOR
 #define USE_SERIALSHOT
 
-#define USE_SECONDARY_IMU
-#define USE_IMU_BNO055
 #define BNO055_I2C_BUS          BUS_I2C1
diff --git a/src/main/target/MATEKF722PX/target.h b/src/main/target/MATEKF722PX/target.h
index 24c471860e..ca9dd843a6 100755
--- a/src/main/target/MATEKF722PX/target.h
+++ b/src/main/target/MATEKF722PX/target.h
@@ -66,7 +66,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
-
+#define BNO055_I2C_BUS          BUS_I2C1
 #define PITOT_I2C_BUS           BUS_I2C1
 
 #define USE_RANGEFINDER
diff --git a/src/main/target/MATEKF722SE/target.h b/src/main/target/MATEKF722SE/target.h
index fc4a9b10e4..ecff68fa66 100644
--- a/src/main/target/MATEKF722SE/target.h
+++ b/src/main/target/MATEKF722SE/target.h
@@ -195,6 +195,4 @@
 #define USE_SERIALSHOT
 #define USE_ESC_SENSOR
 
-#define USE_SECONDARY_IMU
-#define USE_IMU_BNO055
 #define BNO055_I2C_BUS          BUS_I2C1
\ No newline at end of file
diff --git a/src/main/target/MATEKF765/target.h b/src/main/target/MATEKF765/target.h
index 48dde29e1e..8f5b256026 100644
--- a/src/main/target/MATEKF765/target.h
+++ b/src/main/target/MATEKF765/target.h
@@ -86,7 +86,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
-
+#define BNO055_I2C_BUS          BUS_I2C2
 #define PITOT_I2C_BUS           BUS_I2C2
 
 #define USE_RANGEFINDER
diff --git a/src/main/target/MATEKH743/target.h b/src/main/target/MATEKH743/target.h
index b8ac4303eb..cc3409c8f5 100644
--- a/src/main/target/MATEKH743/target.h
+++ b/src/main/target/MATEKH743/target.h
@@ -157,7 +157,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
-
+#define BNO055_I2C_BUS          BUS_I2C2
 #define PITOT_I2C_BUS           BUS_I2C2
 
 #define USE_RANGEFINDER
diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h
index 386eadf120..81d44eb6a2 100644
--- a/src/main/target/MOTOLAB/target.h
+++ b/src/main/target/MOTOLAB/target.h
@@ -120,4 +120,5 @@
 // !!TODO - check the following line is correct
 #define TARGET_IO_PORTF         (BIT(0)|BIT(1)|BIT(3)|BIT(4))
 
-#define PCA9685_I2C_BUS         BUS_I2C2
\ No newline at end of file
+#define PCA9685_I2C_BUS         BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
\ No newline at end of file
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index 0c3666a9d3..2a4383ab4d 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -100,6 +100,7 @@
 #define USE_MAG_AK8975
 
 #define TEMPERATURE_I2C_BUS     I2C_EXT_BUS
+#define BNO055_I2C_BUS          I2C_EXT_BUS
 
 #define USE_BARO
 
diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h
index d013a36a6c..d82ba047b1 100644
--- a/src/main/target/OMNIBUSF7/target.h
+++ b/src/main/target/OMNIBUSF7/target.h
@@ -158,6 +158,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_HCSR04_I2C
diff --git a/src/main/target/OMNIBUSF7NXT/target.h b/src/main/target/OMNIBUSF7NXT/target.h
index b14e0c219e..241322b5d6 100644
--- a/src/main/target/OMNIBUSF7NXT/target.h
+++ b/src/main/target/OMNIBUSF7NXT/target.h
@@ -59,6 +59,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_BARO
 #define USE_BARO_LPS25H
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index be2c511c19..360d097c69 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -56,6 +56,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C1
diff --git a/src/main/target/RUSH_BLADE_F7/target.h b/src/main/target/RUSH_BLADE_F7/target.h
index ca0175f10d..cdae1860b3 100644
--- a/src/main/target/RUSH_BLADE_F7/target.h
+++ b/src/main/target/RUSH_BLADE_F7/target.h
@@ -66,7 +66,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
-
+#define BNO055_I2C_BUS          BUS_I2C1
 #define PITOT_I2C_BUS           BUS_I2C1
 
 #define USE_RANGEFINDER
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index f716369b74..c1d18603d5 100644
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -53,6 +53,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C1
diff --git a/src/main/target/SPEEDYBEEF4/target.h b/src/main/target/SPEEDYBEEF4/target.h
index 1365b7aec5..c51b558832 100644
--- a/src/main/target/SPEEDYBEEF4/target.h
+++ b/src/main/target/SPEEDYBEEF4/target.h
@@ -124,6 +124,8 @@
 #define SERIAL_PORT_COUNT       6
 #endif
 
+#define BNO055_I2C_BUS          BUS_I2C1
+
 /*** BARO & MAG ***/
 #define USE_BARO							
 #define BARO_I2C_BUS          	BUS_I2C1	
diff --git a/src/main/target/SPEEDYBEEF7/target.h b/src/main/target/SPEEDYBEEF7/target.h
index a5c8b9150e..71e855af0a 100644
--- a/src/main/target/SPEEDYBEEF7/target.h
+++ b/src/main/target/SPEEDYBEEF7/target.h
@@ -120,7 +120,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
-
+#define BNO055_I2C_BUS          BUS_I2C2
 #define PITOT_I2C_BUS           BUS_I2C2
 
 #define USE_RANGEFINDER
diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h
index c1da04f60b..efe89add1e 100755
--- a/src/main/target/SPRACINGF4EVO/target.h
+++ b/src/main/target/SPRACINGF4EVO/target.h
@@ -59,6 +59,7 @@
 #define USE_MAG_LIS3MDL
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_VCP
 
diff --git a/src/main/target/SPRACINGF7DUAL/target.h b/src/main/target/SPRACINGF7DUAL/target.h
index aead3cbe59..9bbc2a7455 100644
--- a/src/main/target/SPRACINGF7DUAL/target.h
+++ b/src/main/target/SPRACINGF7DUAL/target.h
@@ -62,6 +62,8 @@
 #define USE_BARO_BMP280
 #define USE_BARO_MS5611
 
+#define BNO055_I2C_BUS          BUS_I2C1
+
 #define MAG_I2C_BUS             BUS_I2C1
 #define USE_MAG
 #define USE_MAG_HMC5883
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index dc423616f2..7f05ef7ef4 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -68,6 +68,7 @@
 #define USE_MAG_QMC5883
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C2
+#define BNO055_I2C_BUS          BUS_I2C2
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C2
diff --git a/src/main/target/YUPIF7/target.h b/src/main/target/YUPIF7/target.h
index b7799bfb81..87f600f32d 100644
--- a/src/main/target/YUPIF7/target.h
+++ b/src/main/target/YUPIF7/target.h
@@ -50,6 +50,7 @@
 #define USE_MAG_QMC5883
 
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
+#define BNO055_I2C_BUS          BUS_I2C1
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C1
diff --git a/src/main/target/common.h b/src/main/target/common.h
index 9d0ddc3346..18780d4f07 100755
--- a/src/main/target/common.h
+++ b/src/main/target/common.h
@@ -148,6 +148,9 @@
 #define USE_SERIALRX_GHST
 #define USE_TELEMETRY_GHST
 
+#define USE_SECONDARY_IMU
+#define USE_IMU_BNO055
+
 #else // MCU_FLASH_SIZE < 256
 #define LOG_LEVEL_MAXIMUM LOG_LEVEL_ERROR
 #endif