diff --git a/Makefile b/Makefile
index 4c3ebf560..90217b59a 100644
--- a/Makefile
+++ b/Makefile
@@ -879,11 +879,8 @@ TARGET_DEPS	 = $(addsuffix .d,$(addprefix $(OBJECT_DIR)/$(TARGET)/,$(basename $(
 TARGET_MAP	 = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).map
 
 
-ifeq ($(OPBL),yes)
 CLEAN_ARTIFACTS := $(TARGET_BIN)
-else
-CLEAN_ARTIFACTS := $(TARGET_HEX)
-endif
+CLEAN_ARTIFACTS += $(TARGET_HEX)
 CLEAN_ARTIFACTS += $(TARGET_ELF) $(TARGET_OBJS) $(TARGET_MAP) 
 
 # List of buildable ELF files and their object dependencies.
diff --git a/top_makefile b/top_makefile
index a091319a6..d765dcf35 100644
--- a/top_makefile
+++ b/top_makefile
@@ -22,7 +22,7 @@ clean_cc3d cc3d:                          opts := TARGET=CC3D
 clean_cc3d_opbl cc3d_opbl :               opts := TARGET=CC3D_OPBL
 clean_spracingf3mini spracingf3mini :     opts := TARGET=SPRACINGF3MINI
 clean_spracingf3 spracingf3 :             opts := TARGET=SPRACINGF3
-clean_spracingf3 spracingf3evo :          opts := TARGET=SPRACINGF3EVO
+clean_spracingf3evo spracingf3evo :       opts := TARGET=SPRACINGF3EVO
 clean_sparky sparky :                     opts := TARGET=SPARKY
 clean_alienflightf1 alienflightf1 :       opts := TARGET=ALIENFLIGHTF1
 clean_alienflightf3 alienflightf3  :      opts := TARGET=ALIENFLIGHTF3
@@ -49,7 +49,7 @@ everything: $(ALL_TARGETS)
 
 .PHONY:$(ALL_TARGETS)
 $(ALL_TARGETS):
-	make -f Makefile $(opts)
+	make -f Makefile hex binary $(opts)
 
 .PHONY: $(CLEAN_TARGETS)
 $(CLEAN_TARGETS):