diff --git a/Makefile b/Makefile
index 01511d2ec..5708af8af 100644
--- a/Makefile
+++ b/Makefile
@@ -756,7 +756,11 @@ ifeq ($(DEBUG),GDB)
 OPTIMIZE    = -O0
 LTO_FLAGS   = $(OPTIMIZE)
 else
+ifeq ($(TARGET),$(filter $(TARGET),$(F1_TARGETS)))
 OPTIMIZE    = -Os
+else
+OPTIMIZE    = -Ofast
+endif
 LTO_FLAGS   = -flto -fuse-linker-plugin $(OPTIMIZE)
 endif
 
diff --git a/src/main/target/common.h b/src/main/target/common.h
index f6402d651..775ecf8dc 100644
--- a/src/main/target/common.h
+++ b/src/main/target/common.h
@@ -34,6 +34,7 @@
 #define STM_FAST_TARGET
 #define USE_DSHOT
 #define I2C3_OVERCLOCK true
+#define GPS
 #endif
 
 #ifdef STM32F3
@@ -70,7 +71,6 @@
 
 #if (FLASH_SIZE > 64)
 #define BLACKBOX
-#define GPS
 #define TELEMETRY
 #define TELEMETRY_FRSKY
 #define TELEMETRY_HOTT