diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk
index 7b49176c..f7789892 100644
--- a/make/defs-cpp.mk
+++ b/make/defs-cpp.mk
@@ -34,6 +34,11 @@ ifneq ($(findstring st-nucleo-f103rb,$(TAGGED_TMPL_TAGS)),)
   MCU_MEM_FETCH_OFFSET      ?= 0x08000000
   MCU_MEM_FETCH_SIZE        ?= $(MCU_FLASH_SIZE)
   #MCU_OPENOCD_CFG_NAME     ?= openocd-$(MCU_BOARD_LC).cfg
+  ifneq ($(findstring j-link,$(TAGGED_TMPL_TAGS)),)
+    MCU_OPENOCD_CFG_NAME    ?= openocd-st-nucleo-f103rb-jlink.cfg
+  else
+    MCU_OPENOCD_CFG_NAME    ?= openocd-st-nucleo-f103rb.cfg
+  endif
   MODM_BSPS                 += modm:nucleo-f103rb
   MCU_FLASH_BANK_NAME       ?= internal
   ifneq ($(MCU_FLASH_BANK_NAME),internal)
@@ -76,7 +81,11 @@ else ifneq ($(findstring st-disco-f769i,$(TAGGED_TMPL_TAGS)),)
   TAGGED_TMPL_TAGS          += cortex-m7
   MCU_BOARD_MODEL           ?= ST-DISCO-F769I
   BUILD_CPPFLAGS            += -DST_DISCO_F769I
-  MCU_OPENOCD_CFG_NAME      ?= openocd-stmqspi-st-stm32f769i-disco.cfg
+  ifneq ($(findstring j-link,$(TAGGED_TMPL_TAGS)),)
+    MCU_OPENOCD_CFG_NAME    ?= openocd-stmqspi-st-stm32f769i-disco-jlink.cfg
+  else
+    MCU_OPENOCD_CFG_NAME    ?= openocd-stmqspi-st-stm32f769i-disco.cfg
+  endif
   MCU_FLASH_BANK_NAME       ?= external
   ifeq ($(MCU_FLASH_BANK_NAME),external)
     MCU_FLASH_OFFSET        ?= 0x00000000