diff --git a/conf/Makefile.chibios b/conf/Makefile.chibios
index 0e65efef3c..5beb004bd0 100644
--- a/conf/Makefile.chibios
+++ b/conf/Makefile.chibios
@@ -343,8 +343,8 @@ GDB = $(shell which arm-none-eabi-gdb)
 
 
 # Settings for OOCD
-$(TARGET).OOCD_INTERFACE=flossjtag
-OOCD_INTERFACE=flossjtag
+$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
+OOCD_INTERFACE=ftdi/flossjtag
 OOCD = $(shell which openocd)
 
 ifndef $(TARGET).OOCD_BOARD
diff --git a/conf/Makefile.lpc21 b/conf/Makefile.lpc21
index b51c44546d..5fb22bb070 100644
--- a/conf/Makefile.lpc21
+++ b/conf/Makefile.lpc21
@@ -157,7 +157,7 @@ LPC21IAP = $(PAPARAZZI_SRC)/sw/ground_segment/lpc21iap/lpc21iap
 # ---------------------------------------------------------------------------
 # Flash-Programming support using openocd
 OOCD ?= openocd
-OOCD_INTERFACE = arm-usb-ocd
+OOCD_INTERFACE = ftdi/olimex-arm-usb-ocd
 OOCD_TARGET    = csc
 
 
diff --git a/conf/Makefile.stm32-upload b/conf/Makefile.stm32-upload
index 3228726899..d25b530b4b 100644
--- a/conf/Makefile.stm32-upload
+++ b/conf/Makefile.stm32-upload
@@ -99,7 +99,7 @@ OOCD_OPTIONS = -c "ft2232_serial $(BOARD_SERIAL)"
 endif
 
 ifndef $(TARGET).OOCD_INTERFACE
-OOCD_INTERFACE = lisa-l
+OOCD_INTERFACE = ftdi/lisa-l
 else
 OOCD_INTERFACE =  $($(TARGET).OOCD_INTERFACE)
 endif
diff --git a/conf/boards/cc3d.makefile b/conf/boards/cc3d.makefile
index 46d542107c..19c5ccc642 100644
--- a/conf/boards/cc3d.makefile
+++ b/conf/boards/cc3d.makefile
@@ -11,7 +11,7 @@ BOARD_CFG=\"boards/$(BOARD).h\"
 ARCH=stm32
 $(TARGET).ARCHDIR = $(ARCH)
 # not needed?
-$(TARGET).OOCD_INTERFACE=flossjtag
+$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
 $(TARGET).LDSCRIPT=$(SRC_ARCH)/cc3d.ld
 
 # -----------------------------------------------------------------------
diff --git a/conf/boards/cjmcu.makefile b/conf/boards/cjmcu.makefile
index 5ea9395ffd..0a8ffede12 100644
--- a/conf/boards/cjmcu.makefile
+++ b/conf/boards/cjmcu.makefile
@@ -13,7 +13,7 @@ BOARD_CFG=\"boards/$(BOARD).h\"
 ARCH=stm32
 $(TARGET).ARCHDIR = $(ARCH)
 # not needed?
-$(TARGET).OOCD_INTERFACE=flossjtag
+$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
 $(TARGET).LDSCRIPT=$(SRC_ARCH)/cjmcu.ld
 
 # -----------------------------------------------------------------------
diff --git a/conf/boards/krooz_sd.makefile b/conf/boards/krooz_sd.makefile
index 237675493c..8992c31212 100644
--- a/conf/boards/krooz_sd.makefile
+++ b/conf/boards/krooz_sd.makefile
@@ -16,8 +16,8 @@ ARCH_DIR=stm32
 SRC_ARCH=arch/$(ARCH_DIR)
 $(TARGET).ARCHDIR = $(ARCH)
 # not needed?
-$(TARGET).OOCD_INTERFACE=flossjtag
-#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
+$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
+#$(TARGET).OOCD_INTERFACE=ftdi/jtagkey
 $(TARGET).LDSCRIPT=$(SRC_ARCH)/krooz.ld
 
 # -----------------------------------------------------------------------
diff --git a/conf/boards/lia_1.1.makefile b/conf/boards/lia_1.1.makefile
index 2e7d60f8dd..4757f79477 100644
--- a/conf/boards/lia_1.1.makefile
+++ b/conf/boards/lia_1.1.makefile
@@ -12,8 +12,8 @@ BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 ARCH=stm32
 $(TARGET).ARCHDIR = $(ARCH)
 # not needed?
-$(TARGET).OOCD_INTERFACE=flossjtag
-#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
+$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
+#$(TARGET).OOCD_INTERFACE=ftdi/jtagkey
 $(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-m.ld
 
 # -----------------------------------------------------------------------
diff --git a/conf/boards/lisa_m_1.0.makefile b/conf/boards/lisa_m_1.0.makefile
index f0e52e88d3..7ec2a1a34d 100644
--- a/conf/boards/lisa_m_1.0.makefile
+++ b/conf/boards/lisa_m_1.0.makefile
@@ -12,8 +12,8 @@ BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 ARCH=stm32
 $(TARGET).ARCHDIR = $(ARCH)
 # not needed?
-$(TARGET).OOCD_INTERFACE=flossjtag
-#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
+$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
+#$(TARGET).OOCD_INTERFACE=ftdi/jtagkey
 $(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-m.ld
 
 # -----------------------------------------------------------------------
diff --git a/conf/boards/lisa_m_common.makefile b/conf/boards/lisa_m_common.makefile
index 9fc1dda84a..93b8b9b377 100644
--- a/conf/boards/lisa_m_common.makefile
+++ b/conf/boards/lisa_m_common.makefile
@@ -8,8 +8,8 @@ BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 ARCH=stm32
 $(TARGET).ARCHDIR = $(ARCH)
 # not needed?
-$(TARGET).OOCD_INTERFACE=flossjtag
-#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
+$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
+#$(TARGET).OOCD_INTERFACE=ftdi/jtagkey
 $(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-m.ld
 
 # -----------------------------------------------------------------------
diff --git a/sw/airborne/arch/stm32/cjmcu.makefile b/sw/airborne/arch/stm32/cjmcu.makefile
index e53b9414d1..d492e6f48a 100644
--- a/sw/airborne/arch/stm32/cjmcu.makefile
+++ b/sw/airborne/arch/stm32/cjmcu.makefile
@@ -13,7 +13,7 @@ BOARD_CFG=\"boards/$(BOARD).h\"
 ARCH=stm32
 $(TARGET).ARCHDIR = $(ARCH)
 # not needed?
-$(TARGET).OOCD_INTERFACE=flossjtag
+$(TARGET).OOCD_INTERFACE=ftdi/flossjtag
 $(TARGET).LDSCRIPT=$(SRC_ARCH)/cjmcu.ld
 
 # -----------------------------------------------------------------------