diff --git a/targets/circuitplay-bluefruit.json b/targets/circuitplay-bluefruit.json
index 0c1f6ae3..de3c88c3 100644
--- a/targets/circuitplay-bluefruit.json
+++ b/targets/circuitplay-bluefruit.json
@@ -1,12 +1,6 @@
 {
-    "inherits": ["nrf52840"],
-    "build-tags": ["circuitplay_bluefruit","nrf52840_reset_uf2", "softdevice", "s140v6"],
-    "serial": "usb",
-    "flash-1200-bps-reset": "true",
-    "flash-method": "msd",
+    "inherits": ["nrf52840", "nrf52840-s140v6-uf2"],
+    "build-tags": ["circuitplay_bluefruit"],
     "serial-port": ["acm:239a:8045", "acm:239a:45"],
-    "msd-volume-name": "CPLAYBTBOOT",
-    "msd-firmware-name": "firmware.uf2",
-    "uf2-family-id": "0xADA52840",
-    "linkerscript": "targets/circuitplay-bluefruit.ld"
+    "msd-volume-name": "CPLAYBTBOOT"
 }
diff --git a/targets/clue-alpha.json b/targets/clue-alpha.json
index 26088d53..d49c49f7 100644
--- a/targets/clue-alpha.json
+++ b/targets/clue-alpha.json
@@ -1,12 +1,6 @@
 {
-    "inherits": ["nrf52840"],
-    "build-tags": ["clue_alpha","nrf52840_reset_uf2", "softdevice", "s140v6"],
-    "serial": "usb",
+    "inherits": ["nrf52840", "nrf52840-s140v6-uf2"],
+    "build-tags": ["clue_alpha"],
     "serial-port": ["acm:239a:8072", "acm:239a:0072", "acm:239a:0071", "acm:239a:8071"],
-    "flash-1200-bps-reset": "true",
-    "flash-method": "msd",
-    "msd-volume-name": "CLUEBOOT",
-    "msd-firmware-name": "firmware.uf2",
-    "uf2-family-id": "0xADA52840",
-    "linkerscript": "targets/circuitplay-bluefruit.ld"
+    "msd-volume-name": "CLUEBOOT"
 }
diff --git a/targets/feather-nrf52840-sense.json b/targets/feather-nrf52840-sense.json
index b39c8210..d378c171 100644
--- a/targets/feather-nrf52840-sense.json
+++ b/targets/feather-nrf52840-sense.json
@@ -1,12 +1,6 @@
 {
-    "inherits": ["nrf52840"],
-    "build-tags": ["feather_nrf52840_sense","nrf52840_reset_uf2", "softdevice", "s140v6"],
-    "serial": "usb",
+    "inherits": ["nrf52840", "nrf52840-s140v6-uf2"],
+    "build-tags": ["feather_nrf52840_sense"],
     "serial-port": ["acm:239a:8087", "acm:239a:0087", "acm:239a:0088", "acm:239a:8088"],
-    "flash-1200-bps-reset": "true",
-    "flash-method": "msd",
-    "msd-volume-name": "FTHRSNSBOOT",
-    "msd-firmware-name": "firmware.uf2",
-    "uf2-family-id": "0xADA52840",
-    "linkerscript": "targets/circuitplay-bluefruit.ld"
+    "msd-volume-name": "FTHRSNSBOOT"
 }
diff --git a/targets/feather-nrf52840.json b/targets/feather-nrf52840.json
index a4c49195..b46ed396 100644
--- a/targets/feather-nrf52840.json
+++ b/targets/feather-nrf52840.json
@@ -1,12 +1,6 @@
 {
-    "inherits": ["nrf52840"],
-    "build-tags": ["feather_nrf52840","nrf52840_reset_uf2", "softdevice", "s140v6"],
-    "serial": "usb",
+    "inherits": ["nrf52840", "nrf52840-s140v6-uf2"],
+    "build-tags": ["feather_nrf52840"],
     "serial-port": ["acm:239a:8029", "acm:239a:0029", "acm:239a:002a", "acm:239a:802a"],
-    "flash-1200-bps-reset": "true",
-    "flash-method": "msd",
-    "msd-volume-name": "FTHR840BOOT",
-    "msd-firmware-name": "firmware.uf2",
-    "uf2-family-id": "0xADA52840",
-    "linkerscript": "targets/circuitplay-bluefruit.ld"
+    "msd-volume-name": "FTHR840BOOT"
 }
diff --git a/targets/itsybitsy-nrf52840.json b/targets/itsybitsy-nrf52840.json
index d657b8a9..72bc963e 100644
--- a/targets/itsybitsy-nrf52840.json
+++ b/targets/itsybitsy-nrf52840.json
@@ -1,12 +1,6 @@
 {
-    "inherits": ["nrf52840"],
-    "build-tags": ["itsybitsy_nrf52840","nrf52840_reset_uf2", "softdevice", "s140v6"],
-    "serial": "usb",
+    "inherits": ["nrf52840", "nrf52840-s140v6-uf2"],
+    "build-tags": ["itsybitsy_nrf52840"],
     "serial-port": ["acm:239A:8052", "acm:239A:0052", "acm:239A:0051", "acm:239A:8051"],
-    "flash-1200-bps-reset": "true",
-    "flash-method": "msd",
-    "msd-volume-name": "ITSY840BOOT",
-    "msd-firmware-name": "firmware.uf2",
-    "uf2-family-id": "0xADA52840",
-    "linkerscript": "targets/circuitplay-bluefruit.ld"
+    "msd-volume-name": "ITSY840BOOT"
 }
diff --git a/targets/mdbt50qrx-uf2.json b/targets/mdbt50qrx-uf2.json
index f7cf1b4d..58213e77 100644
--- a/targets/mdbt50qrx-uf2.json
+++ b/targets/mdbt50qrx-uf2.json
@@ -1,12 +1,6 @@
 {
-    "inherits": ["nrf52840"],
-    "build-tags": ["mdbt50qrx", "nrf52840_reset_uf2", "softdevice", "s140v6"],
-    "serial": "usb",
-    "flash-1200-bps-reset": "true",
-    "flash-method": "msd",
+    "inherits": ["nrf52840", "nrf52840-s140v6-uf2"],
+    "build-tags": ["mdbt50qrx"],
     "serial-port": ["acm:239a:810b", "acm:239a:010b", "acm:239a:810c"],
-    "msd-volume-name": "MDBT50QBOOT",
-    "msd-firmware-name": "firmware.uf2",
-    "uf2-family-id": "0xADA52840",
-    "linkerscript": "targets/circuitplay-bluefruit.ld"
+    "msd-volume-name": "MDBT50QBOOT"
 }
diff --git a/targets/nano-33-ble-s140v6-uf2.json b/targets/nano-33-ble-s140v6-uf2.json
new file mode 100644
index 00000000..88de2e83
--- /dev/null
+++ b/targets/nano-33-ble-s140v6-uf2.json
@@ -0,0 +1,6 @@
+{
+	"inherits": ["nrf52840", "nrf52840-s140v6-uf2"],
+	"build-tags": ["nano_33_ble"],
+	"serial-port": ["acm:239a:8063", "acm:239a:0063"],
+	"msd-volume-name": "NANO33BOOT"
+}
diff --git a/targets/nicenano.json b/targets/nicenano.json
index b18a0c1c..210bfae7 100644
--- a/targets/nicenano.json
+++ b/targets/nicenano.json
@@ -1,11 +1,5 @@
 {
-    "inherits": ["nrf52840"],
-    "build-tags": ["nicenano","nrf52840_reset_uf2", "softdevice", "s140v6"],
-    "serial": "usb",
-    "flash-1200-bps-reset": "true",
-    "flash-method": "msd",
-    "msd-volume-name": "NICENANO",
-    "msd-firmware-name": "firmware.uf2",
-    "uf2-family-id": "0xADA52840",
-    "linkerscript": "targets/circuitplay-bluefruit.ld"
+    "inherits": ["nrf52840", "nrf52840-s140v6-uf2"],
+    "build-tags": ["nicenano"],
+    "msd-volume-name": "NICENANO"
 }
diff --git a/targets/nrf52840-mdk-usb-dongle.json b/targets/nrf52840-mdk-usb-dongle.json
index 34e76b77..6d84c56f 100644
--- a/targets/nrf52840-mdk-usb-dongle.json
+++ b/targets/nrf52840-mdk-usb-dongle.json
@@ -1,11 +1,5 @@
 {
-    "inherits": ["nrf52840"],
-    "build-tags": ["nrf52840_mdk_usb_dongle", "nrf52840_reset_uf2", "softdevice", "s140v6"],
-    "serial": "usb",
-    "flash-1200-bps-reset": "true",
-    "flash-method": "msd",
-    "msd-volume-name": "MDK-DONGLE",
-    "msd-firmware-name": "firmware.uf2",
-    "uf2-family-id": "0xADA52840",
-    "linkerscript": "targets/circuitplay-bluefruit.ld"
+    "inherits": ["nrf52840", "nrf52840-s140v6-uf2"],
+    "build-tags": ["nrf52840_mdk_usb_dongle"],
+    "msd-volume-name": "MDK-DONGLE"
 }
diff --git a/targets/nrf52840-s140v6-uf2.json b/targets/nrf52840-s140v6-uf2.json
new file mode 100644
index 00000000..111c40c4
--- /dev/null
+++ b/targets/nrf52840-s140v6-uf2.json
@@ -0,0 +1,10 @@
+{
+	"build-tags": ["nrf52840_reset_uf2", "softdevice", "s140v6"],
+	"linkerscript": "targets/nrf52840-s140v6-uf2.ld",
+	"serial": "usb",
+	"flash-1200-bps-reset": "true",
+	"flash-method": "msd",
+	"msd-firmware-name": "firmware.uf2",
+	"binary-format": "uf2",
+	"uf2-family-id": "0xADA52840"
+}
diff --git a/targets/circuitplay-bluefruit.ld b/targets/nrf52840-s140v6-uf2.ld
similarity index 100%
rename from targets/circuitplay-bluefruit.ld
rename to targets/nrf52840-s140v6-uf2.ld