diff --git a/tcl/target/st/stm32mp13x.cfg b/tcl/target/st/stm32mp13x.cfg
index 164e0ff1f..acd2ce0ed 100644
--- a/tcl/target/st/stm32mp13x.cfg
+++ b/tcl/target/st/stm32mp13x.cfg
@@ -119,6 +119,8 @@ $_CHIPNAME.ap1 configure -event reset-assert-post {
 
 $_CHIPNAME.ap1 configure -event reset-deassert-pre {
 	adapter deassert srst deassert trst
+	catch {dap init}
+	catch {$::_CHIPNAME.dap apid 1}
 	$::_CHIPNAME.ap1 arp_examine
 	_handshake_with_wrapper $halt
 	_enable_debug
diff --git a/tcl/target/st/stm32mp15x.cfg b/tcl/target/st/stm32mp15x.cfg
index 979a5a491..3d7225271 100644
--- a/tcl/target/st/stm32mp15x.cfg
+++ b/tcl/target/st/stm32mp15x.cfg
@@ -175,6 +175,8 @@ $_CHIPNAME.ap1  configure -event reset-assert-post {
 
 $_CHIPNAME.ap1  configure -event reset-deassert-pre {
 	adapter deassert srst deassert trst
+	catch {dap init}
+	catch {$::_CHIPNAME.dap apid 1}
 	$::_CHIPNAME.ap1 arp_examine
 	_handshake_with_wrapper $halt
 	if { $::EN_CA7_0 } {
diff --git a/tcl/target/st/stm32mp21x.cfg b/tcl/target/st/stm32mp21x.cfg
index f4073a9f5..9a102c6d9 100644
--- a/tcl/target/st/stm32mp21x.cfg
+++ b/tcl/target/st/stm32mp21x.cfg
@@ -182,6 +182,8 @@ $_CHIPNAME.axi configure -event reset-assert-post {
 
 $_CHIPNAME.axi configure -event reset-deassert-pre {
 	adapter deassert srst deassert trst
+	catch {dap init}
+	catch {$::_CHIPNAME.dap apid 0}
 	$::_CHIPNAME.axi arp_examine
 	set is_dev_boot [_enable_dbgmcu_on_devboot]
 	if { !$is_dev_boot } {
diff --git a/tcl/target/st/stm32mp23x.cfg b/tcl/target/st/stm32mp23x.cfg
index 015f816e4..7ca1830e3 100644
--- a/tcl/target/st/stm32mp23x.cfg
+++ b/tcl/target/st/stm32mp23x.cfg
@@ -171,7 +171,8 @@ $_CHIPNAME.axi configure -event reset-assert-post {
 
 $_CHIPNAME.axi configure -event reset-deassert-pre {
 	adapter deassert srst deassert trst
-
+	catch {dap init}
+	catch {$::_CHIPNAME.dap apid 0}
 	$::_CHIPNAME.ap0 arp_examine
 	_handshake_with_wrapper $halt
 
diff --git a/tcl/target/st/stm32mp25x.cfg b/tcl/target/st/stm32mp25x.cfg
index 6807d64a1..92410c7b5 100644
--- a/tcl/target/st/stm32mp25x.cfg
+++ b/tcl/target/st/stm32mp25x.cfg
@@ -191,7 +191,8 @@ $_CHIPNAME.axi configure -event reset-assert-post {
 
 $_CHIPNAME.axi configure -event reset-deassert-pre {
 	adapter deassert srst deassert trst
-
+	catch {dap init}
+	catch {$::_CHIPNAME.dap apid 0}
 	$::_CHIPNAME.ap0 arp_examine
 	_handshake_with_wrapper $halt