diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h
index 5a7599b49e..1facb45f1f 100644
--- a/src/main/target/CLRACINGF4/target.h
+++ b/src/main/target/CLRACINGF4/target.h
@@ -23,7 +23,6 @@
 #define USBD_SERIALNUMBER_STRING "0x8020000" // Remove this at the next major release (?)
 #endif
 
-
 #define LED0_PIN                  PB5
 #define BEEPER                    PB4
 #define BEEPER_INVERTED
@@ -31,23 +30,33 @@
 
 #define INVERTER_PIN_UART1        PC0 // PC0 used as inverter select GPIO
 
-#define MPU6000_CS_PIN            PA4
-#define MPU6000_SPI_INSTANCE      SPI1
 
-#define ACC
-#define USE_ACC_SPI_MPU6000
-
-#define GYRO
-#define USE_GYRO_SPI_MPU6000
-
-#define GYRO_MPU6000_ALIGN       CW0_DEG
-#define ACC_MPU6000_ALIGN        CW0_DEG
-
-// MPU6000 interrupts
 #define USE_EXTI
 #define MPU_INT_EXTI            PC4
 #define USE_MPU_DATA_READY_SIGNAL
 
+//  MPU 6000
+#define MPU6000_CS_PIN            PA4
+#define MPU6000_SPI_INSTANCE      SPI1
+#define ACC
+#define USE_ACC_SPI_MPU6000
+#define GYRO
+#define USE_GYRO_SPI_MPU6000
+#define GYRO_MPU6000_ALIGN       CW0_DEG
+#define ACC_MPU6000_ALIGN        CW0_DEG
+
+// ICM-20602
+#define USE_ACC_MPU6500
+#define USE_ACC_SPI_MPU6500
+#define USE_GYRO_MPU6500
+#define USE_GYRO_SPI_MPU6500
+
+#define ACC_MPU6500_ALIGN       CW0_DEG
+#define GYRO_MPU6500_ALIGN      CW0_DEG
+#define MPU6500_CS_PIN          PA4
+#define MPU6500_SPI_INSTANCE    SPI1
+
+
 #define OSD
 #define USE_MAX7456
 #define MAX7456_SPI_INSTANCE    SPI3
@@ -69,6 +78,12 @@
 #define SDCARD_DMA_CLK                       RCC_AHB1Periph_DMA1
 #define SDCARD_DMA_CHANNEL                   DMA_Channel_0
 
+#define USE_FLASHFS
+#define USE_FLASH_M25P16
+#define M25P16_CS_PIN           PB3
+#define M25P16_SPI_INSTANCE     SPI3
+
+
 #define USE_VCP
 #define VBUS_SENSING_PIN PC5
 
diff --git a/src/main/target/CLRACINGF4/target.mk b/src/main/target/CLRACINGF4/target.mk
index 871176ead3..a2703931df 100644
--- a/src/main/target/CLRACINGF4/target.mk
+++ b/src/main/target/CLRACINGF4/target.mk
@@ -1,5 +1,8 @@
 F405_TARGETS   += $(TARGET)
-FEATURES       = VCP SDCARD
+FEATURES       = VCP SDCARD ONBOARDFLASH
 TARGET_SRC = \
+            drivers/accgyro/accgyro_mpu.c \
+            drivers/accgyro/accgyro_mpu6500.c \
             drivers/accgyro/accgyro_spi_mpu6000.c \
+            drivers/accgyro/accgyro_spi_mpu6500.c \
             drivers/max7456.c
diff --git a/src/main/target/CLRACINGF7/target.h b/src/main/target/CLRACINGF7/target.h
index 2381b5cea9..f292dee427 100644
--- a/src/main/target/CLRACINGF7/target.h
+++ b/src/main/target/CLRACINGF7/target.h
@@ -59,11 +59,6 @@
 #define MPU6500_CS_PIN          SPI1_NSS_PIN
 #define MPU6500_SPI_INSTANCE    SPI1
 
-// MPU interrupts
-#define USE_EXTI
-#define MPU_INT_EXTI            PC4
-#define USE_MPU_DATA_READY_SIGNAL
-
 #define OSD
 #define USE_MAX7456
 #define MAX7456_SPI_INSTANCE    SPI3