diff --git a/tcl/board/st_nucleo_c0.cfg b/tcl/board/st_nucleo_c0.cfg
index 845b7b50e..a4c0c4f42 100644
--- a/tcl/board/st_nucleo_c0.cfg
+++ b/tcl/board/st_nucleo_c0.cfg
@@ -2,8 +2,6 @@
 
 source [find interface/stlink.cfg]
 
-transport select swd
-
 source [find target/stm32c0x.cfg]
 
 reset_config srst_only
diff --git a/tcl/target/stm32c0x.cfg b/tcl/target/stm32c0x.cfg
index d01512031..35c0c5dc4 100644
--- a/tcl/target/stm32c0x.cfg
+++ b/tcl/target/stm32c0x.cfg
@@ -4,8 +4,8 @@
 #
 # stm32c0 devices support SWD transports only.
 #
+transport select swd
 
-source [find target/swj-dp.tcl]
 source [find mem_helper.tcl]
 
 if { [info exists CHIPNAME] } {
@@ -32,7 +32,7 @@ if { [info exists CPUTAPID] } {
    set _CPUTAPID 0x0bc11477
 }
 
-swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 set _TARGETNAME $_CHIPNAME.cpu