diff --git a/Makefile b/Makefile
index 80cb6fcd0..7d107fe9f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,14 @@ include build/toolchain.$(TOOLCHAIN).mak
 include build/variants.mak
 include build/helpers.mk
 
-ifeq (${MODEL},$(filter ${MODEL},n0110 bootloader))
+ifeq (${MODEL},n0110)
   apps_list = ${EPSILON_APPS}
 else
-  apps_list = $(foreach i, ${EPSILON_APPS}, $(if $(filter external, $(i)),,$(i)))
+  ifeq (${MODEL},n0110)
+    apps_list = ${EPSILON_APPS}
+  else
+    apps_list = $(foreach i, ${EPSILON_APPS}, $(if $(filter external, $(i)),,$(i)))
+  endif
 endif
 
 ifdef FORCE_EXTERNAL
diff --git a/build/targets.device.bootloader.mak b/build/targets.device.bootloader.mak
index c3a7dda42..48466b778 100644
--- a/build/targets.device.bootloader.mak
+++ b/build/targets.device.bootloader.mak
@@ -21,6 +21,11 @@ $(BUILD_DIR)/epsilon.B.$(EXE): $(call flavored_object_for,$(epsilon_src))
 $(BUILD_DIR)/epsilon.B.$(EXE): LDSCRIPT = ion/src/device/bootloader/bootloader.B.ld
 
 $(BUILD_DIR)/epsilon.bin: $(BUILD_DIR)/epsilon.A.bin $(BUILD_DIR)/epsilon.B.bin
+	@echo "COMBINE $@"
+	$(Q) cat $(BUILD_DIR)/epsilon.A.bin >> $(BUILD_DIR)/epsilon.bin
+	$(Q) truncate -s 4MiB $(BUILD_DIR)/epsilon.bin
+	$(Q) cat $(BUILD_DIR)/epsilon.B.bin >> $(BUILD_DIR)/epsilon.bin
+	$(Q) truncate -s 8MiB $(BUILD_DIR)/epsilon.bin
 
 $(foreach flavor,$(epsilon_flavors),$(eval $(call rule_for_epsilon_flavor_bootloader,$(flavor))))
 
@@ -28,6 +33,9 @@ $(foreach flavor,$(epsilon_flavors),$(eval $(call rule_for_epsilon_flavor_bootlo
 HANDY_TARGETS = $(foreach flavor,$(epsilon_flavors_bootloader),epsilon.$(flavor))
 HANDY_TARGETS += epsilon.A epsilon.B
 
+.PHONY: epsilon
+epsilon: $(BUILD_DIR)/epsilon.onboarding.bin
+.DEFAULT_GOAL := epsilon
 
 .PHONY: %_flash
 %_flash: $(BUILD_DIR)/%.dfu