diff --git a/tcl/board/nordic/nrf51-dk.cfg b/tcl/board/nordic/nrf51-dk.cfg
index 4ccd3272e..dee63cc7f 100644
--- a/tcl/board/nordic/nrf51-dk.cfg
+++ b/tcl/board/nordic/nrf51-dk.cfg
@@ -5,7 +5,4 @@
 #
 
 source [find interface/jlink.cfg]
-
-transport select swd
-
 source [find target/nordic/nrf51.cfg]
diff --git a/tcl/board/nordic/nrf52-dk.cfg b/tcl/board/nordic/nrf52-dk.cfg
index 9b2390a62..c35d5c7c6 100644
--- a/tcl/board/nordic/nrf52-dk.cfg
+++ b/tcl/board/nordic/nrf52-dk.cfg
@@ -5,7 +5,4 @@
 #
 
 source [find interface/jlink.cfg]
-
-transport select swd
-
 source [find target/nordic/nrf52.cfg]
diff --git a/tcl/board/nordic/nrf5340-dk.cfg b/tcl/board/nordic/nrf5340-dk.cfg
index fd7a40d66..8d5c11101 100644
--- a/tcl/board/nordic/nrf5340-dk.cfg
+++ b/tcl/board/nordic/nrf5340-dk.cfg
@@ -6,7 +6,4 @@
 #
 
 source [find interface/jlink.cfg]
-
-transport select swd
-
 source [find target/nordic/nrf53.cfg]
diff --git a/tcl/board/nordic/nrf9160-dk.cfg b/tcl/board/nordic/nrf9160-dk.cfg
index dc456202c..b3deedaa8 100644
--- a/tcl/board/nordic/nrf9160-dk.cfg
+++ b/tcl/board/nordic/nrf9160-dk.cfg
@@ -6,7 +6,4 @@
 #
 
 source [find interface/jlink.cfg]
-
-transport select swd
-
 source [find target/nordic/nrf91.cfg]
diff --git a/tcl/target/nordic/nrf51.cfg b/tcl/target/nordic/nrf51.cfg
index 3781eccb5..959ee432f 100644
--- a/tcl/target/nordic/nrf51.cfg
+++ b/tcl/target/nordic/nrf51.cfg
@@ -3,8 +3,8 @@
 #
 # script for Nordic nRF51 series, a Cortex-M0 chip
 #
-
-source [find target/swj-dp.tcl]
+# Devices support SWD transport only
+transport select swd
 
 if { [info exists CHIPNAME] } {
    set _CHIPNAME $CHIPNAME
@@ -12,12 +12,6 @@ if { [info exists CHIPNAME] } {
    set _CHIPNAME nrf51
 }
 
-if { [info exists ENDIAN] } {
-   set _ENDIAN $ENDIAN
-} else {
-   set _ENDIAN little
-}
-
 # Work-area is a space in RAM used for flash programming
 # By default use 16kB
 if { [info exists WORKAREASIZE] } {
@@ -32,7 +26,7 @@ if { [info exists CPUTAPID] } {
    set _CPUTAPID 0x0bb11477
 }
 
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 set _TARGETNAME $_CHIPNAME.cpu
diff --git a/tcl/target/nordic/nrf52.cfg b/tcl/target/nordic/nrf52.cfg
index 0703b1886..c151283da 100644
--- a/tcl/target/nordic/nrf52.cfg
+++ b/tcl/target/nordic/nrf52.cfg
@@ -3,8 +3,9 @@
 #
 # Nordic nRF52 series: ARM Cortex-M4 @ 64 MHz
 #
+# Devices support SWD transport only
+transport select swd
 
-source [find target/swj-dp.tcl]
 source [find mem_helper.tcl]
 
 if { [info exists CHIPNAME] } {
@@ -27,7 +28,7 @@ if { [info exists CPUTAPID] } {
 	set _CPUTAPID 0x2ba01477
 }
 
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 set _TARGETNAME $_CHIPNAME.cpu
diff --git a/tcl/target/nordic/nrf53.cfg b/tcl/target/nordic/nrf53.cfg
index 0dcfd55ec..ce2eaf045 100644
--- a/tcl/target/nordic/nrf53.cfg
+++ b/tcl/target/nordic/nrf53.cfg
@@ -3,8 +3,9 @@
 #
 # Nordic nRF53 series: dual ARM Cortex-M33, multidrop SWD
 #
+# Devices support SWD transport only
+transport select swd
 
-source [find target/swj-dp.tcl]
 source [find mem_helper.tcl]
 
 if { [info exists CHIPNAME] } {
@@ -34,7 +35,7 @@ if { [info exists SWD_INSTANCE_ID] } {
 	set _SWD_INSTANCE_ID 0
 }
 
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 
 if { [info exists SWD_MULTIDROP] } {
 	dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu -dp-id 0x0070289 -instance-id $_SWD_INSTANCE_ID
diff --git a/tcl/target/nordic/nrf91.cfg b/tcl/target/nordic/nrf91.cfg
index 64ed864e7..826d62776 100644
--- a/tcl/target/nordic/nrf91.cfg
+++ b/tcl/target/nordic/nrf91.cfg
@@ -3,8 +3,9 @@
 #
 # Nordic nRF91 series: ARM Cortex-M33, SWD only
 #
+# Devices support SWD transport only
+transport select swd
 
-source [find target/swj-dp.tcl]
 source [find mem_helper.tcl]
 
 if { [info exists CHIPNAME] } {
@@ -27,7 +28,7 @@ if { [info exists CPUTAPID] } {
 	set _CPUTAPID 0x6ba02477
 }
 
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 
 # Contrary to the product specification at least nRF9161 supports multidrop SWD.
 # The instance ID is fixed, no more than one nRF91 can be connected to one SWD bus.