diff --git a/conf/Makefile.stm32-upload b/conf/Makefile.stm32-upload
index 9f2ced9aca..a3c9b65999 100644
--- a/conf/Makefile.stm32-upload
+++ b/conf/Makefile.stm32-upload
@@ -73,9 +73,7 @@ upload: $(OBJDIR)/$(TARGET).bin
 #
 # JTAG flash mode
 else ifeq ($(FLASH_MODE),JTAG)
-# either via normal jtag or BlackMagicProbe
-ifeq ($(BMP_PORT),)
-# normal jtag via OpenOCD
+# via OpenOCD and "normal" jtag
 OOCD ?= openocd
 ifneq ($(BOARD_SERIAL),)
 OOCD_OPTIONS = -c "ft2232_serial $(BOARD_SERIAL)"
@@ -105,10 +103,12 @@ upload: $(OBJDIR)/$(TARGET).hex
 		-c "flash write_image $<" \
 		-c reset \
 		-c shutdown
-else
-# jtag via BMP
-BMP_UPLOAD_SCRIPT ?= $(PAPARAZZI_SRC)/sw/tools/flash_scripts/bmp_jtag_flash.scr
 
+#
+# JTAG flash mode (with Black Magic Probe)
+else ifeq ($(FLASH_MODE),JTAG_BMP)
+BMP_PORT ?= /dev/ttyACM0
+BMP_UPLOAD_SCRIPT ?= $(PAPARAZZI_SRC)/sw/tools/flash_scripts/bmp_jtag_flash.scr
 upload: $(OBJDIR)/$(TARGET).elf
 	@echo "Assuming luftboot bootloader: $(ASSUMING_LUFTBOOT)"
 	@echo "Using Black Magic Probe with JTAG on BMP_PORT $(BMP_PORT)"
@@ -119,6 +119,7 @@ upload: $(OBJDIR)/$(TARGET).elf
 		   -x $(BMP_UPLOAD_SCRIPT) \
 		   $<
 endif
+
 #
 # SWD flash mode (with Black Magic Probe)
 else ifeq ($(FLASH_MODE),SWD)
diff --git a/conf/flash_modes.xml b/conf/flash_modes.xml
index c3d24c60af..597e1fd325 100644
--- a/conf/flash_modes.xml
+++ b/conf/flash_modes.xml
@@ -10,23 +10,22 @@
   <mode name="USB (IAP)" boards="booz_1.0|classix|hb_1.1|logom_2.2|navgo_1.0|sdlog_1.0|tiny_0.99|tiny_1.1|tiny_2.1|tiny_2.11|twog_1.0|umarim_1.0|umarim_lite_2.0|yapa_2.0">
     <variable name="FLASH_MODE" value="IAP"/>
   </mode>
-  <mode name="DFU (stm32_mem)" boards="krooz_sd|lia_1.1|lisa_m_1.1|lisa_m_2.0|px4fmu_1.7">
+  <mode name="USB DFU (stm32_mem)" boards="krooz_sd|lia_1.1|lisa_m_1.1|lisa_m_2.0|px4fmu_1.7">
     <variable name="FLASH_MODE" value="DFU"/>
   </mode>
-  <mode name="DFU-UTIL" boards="apogee_1.0|apogee_0.99|stm32f4_discovery">
+  <mode name="USB DFU-UTIL" boards="apogee_1.0|apogee_0.99|stm32f4_discovery">
     <variable name="FLASH_MODE" value="DFU-UTIL"/>
   </mode>
   <mode name="STLink (SWD)" boards="apogee_1.0|apogee_0.99">
     <variable name="FLASH_MODE" value="STLINK"/>
   </mode>
-  <mode name="BlackMagic Probe (SWD)" boards="apogee_1.0|apogee_0.99|stm32f4_discovery|lisa_m_1.0|px4fmu_1.7">
+  <mode name="BlackMagic Probe (SWD)" boards="apogee_1.0|apogee_0.99|stm32f4_discovery|lisa_m_1.0|lia_1.1|lisa_m_2.0|lisa_s_0.1|px4fmu_1.7">
     <variable name="FLASH_MODE" value="SWD"/>
   </mode>
-  <mode name="BMP (SWD + LUFTBOOT)" boards="lia_1.1|lisa_m_2.0|lisa_s_0.1">
-    <variable name="FLASH_MODE" value="SWD"/>
-    <variable name="HAS_LUFTBOOT" value="1"/>
+  <mode name="BlackMagic Probe (JTAG)" boards="apogee_1.0|apogee_0.99|stm32f4_discovery|lisa_m_1.0|lia_1.1|lisa_m_2.0|lisa_s_0.1|px4fmu_1.7">
+    <variable name="FLASH_MODE" value="JTAG_BMP"/>
   </mode>
-  <mode name="JTAG (OpenOCD or BMP)" boards="krooz_sd|lia_1.1|lisa_l_1.0|lisa_l_1.1|lisa_m_1.0|lisa_m_2.0">
+  <mode name="JTAG (OpenOCD)" boards="krooz_sd|lia_1.1|lisa_l_1.0|lisa_l_1.1|lisa_m_1.0|lisa_m_2.0">
     <variable name="FLASH_MODE" value="JTAG"/>
   </mode>
 </flash_modes>