diff --git a/firmware/Makefile b/firmware/Makefile
index 48d2723abc..f16fb78993 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -25,14 +25,11 @@
 # make docs-enums	Generate docs and enums
 # make config			Generate docs, enums, and configs
 # make						Generate docs, enums, configs, and build firmware
-# make bundle			Generate docs, enums, configs, built bootloader, build firmware, and package both full and autoupdate bundles
+# make bundle			Generate docs, enums, configs, build bootloader, build firmware, and package full bundle
+# make autoupdate	Generate docs, enums, configs, build bootloader, build firmware, and package autoupdate bundle
+# make bundles		Generate docs, enums, configs, build bootloader, build firmware, and package both full and autoupdate bundles
+# make bootloader Generate docs, enums, configs, and build bootloader
 #
-# You can make a single bundle by passing the target bundle path, for example:
-# make ../artifacts/rusefi_bundle_f407-discovery.zip
-# make ../artifacts/rusefi_bundle_f407-discovery_autoupdate.zip
-#
-# You can make the bootloader either by going in to the bootloader subdirectory and running make, or by passing a bootloader target:
-# make bootloader/blbuild/openblt_f407-discovery.bin
 
 CHIBIOS = ChibiOS
 RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
diff --git a/firmware/bundle.mk b/firmware/bundle.mk
index 59b487a8a8..0880bbf520 100644
--- a/firmware/bundle.mk
+++ b/firmware/bundle.mk
@@ -185,11 +185,22 @@ $(ARTIFACTS)/$(BUNDLE_FULL_NAME)_obfuscated_public.zip:  $(OBFUSCATED_OUT) $(BUN
 $(ARTIFACTS)/$(BUNDLE_FULL_NAME)_autoupdate.zip: $(UPDATE_BUNDLE_FILES) | $(ARTIFACTS)
 	cd $(FOLDER) &&	zip -r ../$@ $(subst $(FOLDER)/,,$(UPDATE_BUNDLE_FILES))
 
-.PHONY: bundle obfuscated-bundle
+.PHONY: bundle bundles autoupdate obfuscated bin hex dfu map elf list srec bootloader
 
-bundle: $(ARTIFACTS)/$(BUNDLE_FULL_NAME)_autoupdate.zip $(ARTIFACTS)/$(BUNDLE_FULL_NAME).zip all
+bundle: $(ARTIFACTS)/$(BUNDLE_FULL_NAME).zip
+autoupdate: $(ARTIFACTS)/$(BUNDLE_FULL_NAME)_autoupdate.zip
+obfuscated: $(ARTIFACTS)/$(BUNDLE_FULL_NAME)_obfuscated_public.zip
+bundles: bundle autoupdate
 
-obfuscated-bundle: $(ARTIFACTS)/$(BUNDLE_FULL_NAME)_obfuscated_public.zip
+bootloader: $(BOOTLOADER_BIN)
+
+bin: $(DBIN)
+hex: $(BUILDDIR)/$(PROJECT).hex
+dfu: $(DFU)
+srec: $(BUILDDIR)/rusefi.srec
+elf: $(BUILDDIR)/$(PROJECT).elf
+map: $(BUILDDIR)/$(PROJECT).map
+list: $(BUILDDIR)/$(PROJECT).list
 
 CLEAN_BUNDLE_HOOK:
 	@echo Cleaning Bundle
diff --git a/firmware/rusefi_config.mk b/firmware/rusefi_config.mk
index cbccd13671..8a4f4fe10e 100644
--- a/firmware/rusefi_config.mk
+++ b/firmware/rusefi_config.mk
@@ -69,6 +69,8 @@ else
 endif
 	@touch $@
 
-.PHONY: config
+.PHONY: config ini
+
+ini: $(INI_FILE)
 
 config: .config-sentinel