diff --git a/firmware/bundle.mk b/firmware/bundle.mk
index 6d7e2944e9..81719f5c6f 100644
--- a/firmware/bundle.mk
+++ b/firmware/bundle.mk
@@ -83,8 +83,6 @@ UPDATE_CONSOLE_FOLDER_SOURCES = \
 CONSOLE_FOLDER_SOURCES = \
   ../misc/console_launcher/rusefi_autoupdate.exe \
   ../misc/console_launcher/rusefi_console.exe \
-  ../misc/install/openocd \
-  ../misc/install/STM32_Programmer_CLI \
   $(wildcard ../java_console/*.dll) \
   ../firmware/ext/openblt/Host/libopenblt.dll \
   ../firmware/ext/openblt/Host/BootCommander.exe \
@@ -95,6 +93,15 @@ CONSOLE_FOLDER_SOURCES = \
   ../firmware/ext/openblt/Host/libopenblt_jni.dylib \
   $(SIMULATOR_EXE)
 
+# yes, this one is inverted
+ifneq ($(DO_NOT_BUNDLE_STM32_PROG),yes)
+  CONSOLE_FOLDER_SOURCES += ../misc/install/STM32_Programmer_CLI
+endif
+
+ifeq ($(BUNDLE_OPENOCD),yes)
+  CONSOLE_FOLDER_SOURCES += ../misc/install/openocd
+endif
+
 BOOTLOADER_BIN = bootloader/blbuild/openblt_$(PROJECT_BOARD).bin
 BOOTLOADER_HEX = bootloader/blbuild/openblt_$(PROJECT_BOARD).hex
 
diff --git a/firmware/config/boards/f407-discovery/board.mk b/firmware/config/boards/f407-discovery/board.mk
index df89b538b0..697b8a6de8 100644
--- a/firmware/config/boards/f407-discovery/board.mk
+++ b/firmware/config/boards/f407-discovery/board.mk
@@ -15,6 +15,8 @@ else
   DDEFS += -D$(FW_ID_ENV)
 endif
 
+BUNDLE_OPENOCD = yes
+
 # User can configure LIN/K-line interface
 #DDEFS += -DEFI_KLINE=TRUE
 #DDEFS += -DKLINE_SERIAL_DEVICE_RX=Gpio::C11 -DKLINE_SERIAL_DEVICE_TX=Gpio::C10
diff --git a/firmware/config/boards/f429-discovery/board.mk b/firmware/config/boards/f429-discovery/board.mk
index 617280839e..49df4c0762 100644
--- a/firmware/config/boards/f429-discovery/board.mk
+++ b/firmware/config/boards/f429-discovery/board.mk
@@ -9,6 +9,8 @@ DDEFS += -DFIRMWARE_ID=\"stm32f429\"
 IS_STM32F429 = yes
 EFI_HAS_EXT_SDRAM = yes
 
+BUNDLE_OPENOCD = yes
+
 #LED
 DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::G14
 
diff --git a/firmware/config/boards/f469-discovery/board.mk b/firmware/config/boards/f469-discovery/board.mk
index 6fa3386a6d..152d50f700 100644
--- a/firmware/config/boards/f469-discovery/board.mk
+++ b/firmware/config/boards/f469-discovery/board.mk
@@ -1 +1 @@
-# empty?
+BUNDLE_OPENOCD = yes
diff --git a/firmware/config/boards/nucleo_f413/board.mk b/firmware/config/boards/nucleo_f413/board.mk
index 95cf97bb6e..1129482fe7 100644
--- a/firmware/config/boards/nucleo_f413/board.mk
+++ b/firmware/config/boards/nucleo_f413/board.mk
@@ -1,3 +1,4 @@
 
 DDEFS += -DFIRMWARE_ID=\"nucleo_f413\"
 
+BUNDLE_OPENOCD = yes
diff --git a/firmware/config/boards/nucleo_f429/board.mk b/firmware/config/boards/nucleo_f429/board.mk
index 7f70778321..fa27d96634 100644
--- a/firmware/config/boards/nucleo_f429/board.mk
+++ b/firmware/config/boards/nucleo_f429/board.mk
@@ -11,6 +11,8 @@ DDEFS += -DEFI_ETHERNET=TRUE
 # This is an F429!
 IS_STM32F429 = yes
 
+BUNDLE_OPENOCD = yes
+
 DDEFS += -DFIRMWARE_ID=\"nucleo_f429\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
 DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F429
diff --git a/firmware/config/boards/nucleo_f767/board.mk b/firmware/config/boards/nucleo_f767/board.mk
index 4ce3d353f2..d76fbc7d55 100644
--- a/firmware/config/boards/nucleo_f767/board.mk
+++ b/firmware/config/boards/nucleo_f767/board.mk
@@ -16,6 +16,8 @@ ALLOW_SHADOW = yes
 DDEFS += -DCH_CFG_USE_DYNAMIC=TRUE
 DDEFS += -DEFI_ETHERNET=TRUE
 
+BUNDLE_OPENOCD = yes
+
 DDEFS += -DHW_NUCLEO_F767=1
 
 DDEFS += -DFIRMWARE_ID=\"nucleo_f767\"
diff --git a/firmware/config/boards/nucleo_h743/board.mk b/firmware/config/boards/nucleo_h743/board.mk
index dab2f7a01b..4bef6a6883 100644
--- a/firmware/config/boards/nucleo_h743/board.mk
+++ b/firmware/config/boards/nucleo_h743/board.mk
@@ -10,6 +10,8 @@ ALLOW_SHADOW = yes
 DDEFS += -DCH_CFG_USE_DYNAMIC=TRUE
 DDEFS += -DEFI_ETHERNET=TRUE
 
+BUNDLE_OPENOCD = yes
+
 DDEFS += -DHW_NUCLEO_H743=1
 
 DDEFS += -DFIRMWARE_ID=\"nucleo_h743\"