diff --git a/tcl/board/st_nucleo_g0.cfg b/tcl/board/st_nucleo_g0.cfg
index c68d3d0e5..39036271e 100644
--- a/tcl/board/st_nucleo_g0.cfg
+++ b/tcl/board/st_nucleo_g0.cfg
@@ -12,8 +12,6 @@
 
 source [find interface/stlink.cfg]
 
-transport select swd
-
 source [find target/stm32g0x.cfg]
 
 reset_config srst_only
diff --git a/tcl/target/stm32g0x.cfg b/tcl/target/stm32g0x.cfg
index b6d9a22a2..2a63f689a 100644
--- a/tcl/target/stm32g0x.cfg
+++ b/tcl/target/stm32g0x.cfg
@@ -5,7 +5,8 @@
 #
 # stm32g0 devices support SWD transports only.
 #
-source [find target/swj-dp.tcl]
+transport select swd
+
 source [find mem_helper.tcl]
 
 if { [info exists CHIPNAME] } {
@@ -32,7 +33,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