diff --git a/dts/arm/st/wba/stm32wba.dtsi b/dts/arm/st/wba/stm32wba.dtsi
index c93b042babfdb1c..74eb54467729f47 100644
--- a/dts/arm/st/wba/stm32wba.dtsi
+++ b/dts/arm/st/wba/stm32wba.dtsi
@@ -98,6 +98,12 @@
 		};
 	};
 
+	jtag_port: jtag_port {
+		compatible = "gpio-jtag";
+		jtag-gpios = <&gpioa 13 0>, <&gpioa 14 0>, <&gpioa 15 0>,
+			     <&gpiob 3 0> ,<&gpiob 4 0>;
+	};
+
 	soc {
 		flash: flash-controller@40022000 {
 			compatible = "st,stm32-flash-controller", "st,stm32wba-flash-controller";
diff --git a/dts/bindings/gpio/swj-connector.yaml b/dts/bindings/gpio/swj-connector.yaml
new file mode 100644
index 000000000000000..1ced649632bebb8
--- /dev/null
+++ b/dts/bindings/gpio/swj-connector.yaml
@@ -0,0 +1,5 @@
+description: Serial Wire - JTAG Connector
+
+compatible: "swj-connector"
+
+include: pinctrl-device.yaml
diff --git a/soc/arm/st_stm32/common/CMakeLists.txt b/soc/arm/st_stm32/common/CMakeLists.txt
index 70dd8c865c9789a..af898951cc5f37a 100644
--- a/soc/arm/st_stm32/common/CMakeLists.txt
+++ b/soc/arm/st_stm32/common/CMakeLists.txt
@@ -8,3 +8,7 @@ zephyr_sources_ifdef(CONFIG_STM32_BACKUP_SRAM stm32_backup_sram.c)
 zephyr_linker_sources_ifdef(CONFIG_STM32_BACKUP_SRAM SECTIONS stm32_backup_sram.ld)
 
 zephyr_sources(soc_config.c)
+
+if (NOT CONFIG_DEBUG AND CONFIG_PM)
+  zephyr_sources_ifdef(CONFIG_DT_HAS_SWJ_CONNECTOR_ENABLED pm_debug_swj.c)
+endif()
diff --git a/soc/arm/st_stm32/common/pm_debug_swj.c b/soc/arm/st_stm32/common/pm_debug_swj.c
new file mode 100644
index 000000000000000..8a5d85338f7be0b
--- /dev/null
+++ b/soc/arm/st_stm32/common/pm_debug_swj.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2023 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/init.h>
+
+#define SWJ_NODE DT_NODELABEL(swj_port)
+
+PINCTRL_DT_DEFINE(SWJ_NODE);
+
+const struct pinctrl_dev_config *swj_pcfg = PINCTRL_DT_DEV_CONFIG_GET(SWJ_NODE);
+
+/*
+ * Serial Wire / JTAG port pins are enabled as part of SoC default configuration.
+ * When debug access is not needed and in case power consumption performance is
+ * expected, configure matching pins to analog in order to save power.
+ */
+
+static int swj_to_analog(void)
+{
+	int err;
+
+	/* Set Serial Wire / JTAG port pins to analog mode */
+	err = pinctrl_apply_state(swj_pcfg, PINCTRL_STATE_SLEEP);
+	if (err < 0) {
+		__ASSERT(0, "SWJ pinctrl setup failed");
+		return err;
+	}
+
+	return 0;
+}
+
+SYS_INIT(swj_to_analog, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);