diff --git a/Makefile b/Makefile
index 0a8ac4fc6..a62f98afb 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ include build/struct_layout/Makefile
 include build/scenario/Makefile
 include quiz/Makefile # Quiz needs to be included at the end
 
-all_src = $(app_src) $(escher_src) $(ion_src) $(kandinsky_src) $(liba_src) $(libaxx_src) $(poincare_src) $(python_src) $(ion_device_dfu_relocated_src) $(ion_device_dfu_xip) $(epsilon_src) $(runner_src) $(flasher_src) $(bench_src) $(tests_src)
+all_src = $(apps_all_src) $(escher_src) $(ion_all_src) $(kandinsky_src) $(liba_src) $(libaxx_src) $(poincare_src) $(python_src) $(epsilon_src) $(runner_src) $(ion_target_device_flasher_light_src) $(ion_target_device_flasher_verbose_src) $(ion_target_device_bench_src) $(tests_src)
 all_objs = $(call object_for,$(all_src))
 .SECONDARY: $(all_objs)
 
diff --git a/apps/Makefile b/apps/Makefile
index 65670c6ae..40605127f 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -92,7 +92,12 @@ $(call object_for,$(all_app_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.gene
 
 apps_tests_src = $(app_calculation_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_solver_test_src)
 
-apps_default_src = $(app_src) $(apps_launch_default_src) $(apps_prompt_none_src);
-apps_onboarding_src = $(app_src) $(apps_launch_on_boarding_src) $(apps_prompt_none_src);
-apps_onboarding_update_src = $(app_src) $(apps_launch_on_boarding_src) $(apps_prompt_update_src);
-apps_onboarding_beta_src = $(app_src) $(apps_launch_on_boarding_src) $(apps_prompt_beta_src);
+# Configure variants
+apps_all_src = $(app_src)
+apps_all_src += $(apps_launch_default_src) $(apps_launch_on_boarding_src
+apps_all_src += $(apps_prompt_none_src) $(apps_prompt_update_src) $(apps_prompt_beta_src)
+
+apps_default_src = $(app_src) $(apps_launch_default_src) $(apps_prompt_none_src)
+apps_onboarding_src = $(app_src) $(apps_launch_on_boarding_src) $(apps_prompt_none_src)
+apps_onboarding_update_src = $(app_src) $(apps_launch_on_boarding_src) $(apps_prompt_update_src)
+apps_onboarding_beta_src = $(app_src) $(apps_launch_on_boarding_src) $(apps_prompt_beta_src)
diff --git a/ion/Makefile b/ion/Makefile
index a9a948031..d8a135bea 100644
--- a/ion/Makefile
+++ b/ion/Makefile
@@ -50,6 +50,12 @@ ifdef ION_STORAGE_LOG
 SFLAGS += -DION_STORAGE_LOG=1
 endif
 
+# Configure variants
+ion_all_src = $(ion_src)
+ion_all_src += $(ion_simulator_sdl_src) $(ion_simulator_headless_src)
+ion_all_src += $(ion_device_dfu_relocated_src) $(ion_device_dfu_xip_src)
+ion_all_src += $(ion_console_display_src) $(ion_console_stdio_src) $(ion_console_uart_src)
+
 ion_default_src = $(ion_src) $(ion_simulator_sdl_src) $(ion_device_dfu_relocated_src) $(ion_console_display_src)
 ion_xip_src = $(ion_src) $(ion_simulator_sdl_src) $(ion_device_dfu_xip_src) $(ion_console_uart_src)
 ion_headless_src = $(ion_src) $(ion_simulator_headless_src) $(ion_device_dfu_relocated_src) $(ion_console_stdio_src)