diff --git a/Makefile b/Makefile
index 1cf65c613..96b02ec12 100644
--- a/Makefile
+++ b/Makefile
@@ -333,6 +333,9 @@ targets-group-3: $(GROUP_3_TARGETS)
 ## targets-group-3   : build some targets
 targets-group-4: $(GROUP_4_TARGETS)
 
+## targets-legacy    : build legacy targets
+targets-legacy: $(LEGACY_TARGETS)
+
 ## targets-group-rest: build the rest of the targets (not listed in group 1, 2 or 3)
 targets-group-rest: $(GROUP_OTHER_TARGETS)
 
diff --git a/make/targets.mk b/make/targets.mk
index 4dbd6b3a0..772e150f3 100644
--- a/make/targets.mk
+++ b/make/targets.mk
@@ -1,4 +1,4 @@
-OFFICIAL_TARGETS  = ALIENFLIGHTF3 ALIENFLIGHTF4 ANYFCF7 BETAFLIGHTF3 BLUEJAYF4 CC3D FURYF4 NAZE REVO SIRINFPV SPARKY SPRACINGF3 SPRACINGF3EVO SPRACINGF3NEO SPRACINGF4EVO STM32F3DISCOVERY
+OFFICIAL_TARGETS  = ALIENFLIGHTF3 ALIENFLIGHTF4 ANYFCF7 BETAFLIGHTF3 BLUEJAYF4 FURYF4 REVO SIRINFPV SPARKY SPRACINGF3 SPRACINGF3EVO SPRACINGF3NEO SPRACINGF4EVO STM32F3DISCOVERY
 SKIP_TARGETS     := ALIENWHOOP MOTOLABF4
 ALT_TARGETS       = $(sort $(filter-out target, $(basename $(notdir $(wildcard $(ROOT)/src/main/target/*/*.mk)))))
 OPBL_TARGETS      = $(filter %_OPBL, $(ALT_TARGETS))
@@ -16,29 +16,23 @@ $(error The target specified, $(TARGET), cannot be built. Use one of the ALT tar
 endif
 
 GROUP_1_TARGETS := \
-	AFROMINI \
 	AIORACERF3 \
 	AIR32 \
 	AIRBOTF4 \
 	AIRBOTF4SD \
 	AIRHEROF3 \
-	ALIENFLIGHTF1 \
 	ALIENFLIGHTF3 \
 	ALIENFLIGHTF4 \
 	ALIENFLIGHTNGF7 \
 	ALIENWHOOPF4 \
 	ALIENWHOOPF7 \
 	ANYFCF7 \
-	BEEBRAIN \
 	BEEROTORF4 \
 	BETAFLIGHTF3 \
-	BLUEJAYF4 \
-	CC3D \
-	CC3D_OPBL
+	BLUEJAYF4
 
 GROUP_2_TARGETS := \
 	CHEBUZZF3 \
-	CJMCU \
 	CLRACINGF4 \
 	COLIBRI \
 	COLIBRI_OPBL \
@@ -69,12 +63,10 @@ GROUP_3_TARGETS := \
 	KIWIF4 \
 	LUX_RACE \
 	LUXV2_RACE \
-	MICROSCISKY \
 	MLTEMPF4 \
 	MLTYPHF4 \
 	MOTOLAB \
 	MULTIFLITEPICO \
-	NAZE \
 	NERO \
 	NUCLEOF7 \
 	OMNIBUS \
@@ -106,7 +98,17 @@ GROUP_4_TARGETS := \
 	STM32F3DISCOVERY \
 	TINYBEEF3
 
-GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS), $(VALID_TARGETS))
+LEGACY_TARGETS := \
+	AFROMINI \
+	ALIENFLIGHTF1 \
+	BEEBRAIN \
+	CC3D \
+	CC3D_OPBL \
+	CJMCU \
+	MICROSCISKY \
+	NAZE
+
+GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS) $(LEGACY_TARGETS), $(VALID_TARGETS))
 
 ifeq ($(filter $(TARGET),$(ALT_TARGETS)), $(TARGET))
 BASE_TARGET    := $(firstword $(subst /,, $(subst ./src/main/target/,, $(dir $(wildcard $(ROOT)/src/main/target/*/$(TARGET).mk)))))
diff --git a/src/main/build/version.c b/src/main/build/version.c
index b4a9ea928..43565680e 100644
--- a/src/main/build/version.c
+++ b/src/main/build/version.c
@@ -21,3 +21,7 @@ const char * const targetName = __TARGET__;
 const char * const shortGitRevision = __REVISION__;
 const char * const buildDate = __DATE__;
 const char * const buildTime = __TIME__;
+
+#ifdef STM32F1
+#warning STM32F1 based targets are unsupported as of Betaflight 3.3.
+#endif