diff --git a/scripts/genpinctrl/stm32-pinctrl-config.yaml b/scripts/genpinctrl/stm32-pinctrl-config.yaml
index af0795753..08432c40d 100644
--- a/scripts/genpinctrl/stm32-pinctrl-config.yaml
+++ b/scripts/genpinctrl/stm32-pinctrl-config.yaml
@@ -267,3 +267,6 @@
 
 - name: USB
   match: "^USB_(?:DM)?(?:DP)?(?:NOE)?$"
+
+- name: JTAG PORT
+  match: ^(SYS|DEBUG)_(JTMS-SWDIO|JTCK-SWCLK|JTDI|JTDO(-TRACESWO|-SWO)?|(NJ)?JTRST)$