diff --git a/targets/badger2040.json b/targets/badger2040.json
index 340a8b5b..fb995983 100644
--- a/targets/badger2040.json
+++ b/targets/badger2040.json
@@ -2,7 +2,7 @@
     "inherits": [
         "rp2040"
     ],
-    "serial": "uart",
+    "serial-port": ["acm:2e8a:0003"],
     "build-tags": ["badger2040"],
     "linkerscript": "targets/badger2040.ld",
     "extra-files": [
diff --git a/targets/challenger-rp2040.json b/targets/challenger-rp2040.json
index d7ade643..0c6640c9 100644
--- a/targets/challenger-rp2040.json
+++ b/targets/challenger-rp2040.json
@@ -2,7 +2,7 @@
     "inherits": [
         "rp2040"
     ],
-    "serial": "uart",
+    "serial-port": ["acm:2e8a:1023"],
     "build-tags": ["challenger_rp2040"],
     "linkerscript": "targets/feather-rp2040.ld",
     "extra-files": [
diff --git a/targets/feather-rp2040.json b/targets/feather-rp2040.json
index d13cd207..4a795faa 100644
--- a/targets/feather-rp2040.json
+++ b/targets/feather-rp2040.json
@@ -2,7 +2,6 @@
     "inherits": [
         "rp2040"
     ],
-    "serial": "uart",
     "serial-port": ["acm:239a:80f1"],
     "build-tags": ["feather_rp2040"],
     "linkerscript": "targets/feather-rp2040.ld",
diff --git a/targets/macropad-rp2040.json b/targets/macropad-rp2040.json
index f0e89a10..d67da12d 100644
--- a/targets/macropad-rp2040.json
+++ b/targets/macropad-rp2040.json
@@ -3,7 +3,6 @@
         "rp2040"
     ],
     "build-tags": ["macropad_rp2040"],
-    "serial": "none",
     "serial-port": ["acm:239a:8107"],
     "linkerscript": "targets/pico.ld",
     "extra-files": [
diff --git a/targets/nano-rp2040.json b/targets/nano-rp2040.json
index 461e0746..da637cdc 100644
--- a/targets/nano-rp2040.json
+++ b/targets/nano-rp2040.json
@@ -2,7 +2,7 @@
     "inherits": [
         "rp2040"
     ],
-    "serial": "uart",
+    "serial-port": ["acm:2341:005e"],
     "build-tags": ["nano_rp2040"],
     "linkerscript": "targets/pico.ld",
     "extra-files": [
diff --git a/targets/pico.json b/targets/pico.json
index f3cb6aa5..7d69beb2 100644
--- a/targets/pico.json
+++ b/targets/pico.json
@@ -3,7 +3,6 @@
         "rp2040"
     ],
     "build-tags": ["pico"],
-    "serial": "uart",
     "serial-port": ["acm:2e8a:000A"],
     "linkerscript": "targets/pico.ld",
     "extra-files": [
diff --git a/targets/rp2040.json b/targets/rp2040.json
index 917a743e..b06e2c09 100644
--- a/targets/rp2040.json
+++ b/targets/rp2040.json
@@ -2,6 +2,7 @@
     "inherits": ["cortex-m0plus"],
     "build-tags": ["rp2040", "rp"],
     "flash-method": "msd",
+    "serial": "usb",
     "msd-volume-name": "RPI-RP2",
     "msd-firmware-name": "firmware.uf2",
     "binary-format": "uf2",
diff --git a/targets/thingplus-rp2040.json b/targets/thingplus-rp2040.json
index fdd0257b..8483e02b 100644
--- a/targets/thingplus-rp2040.json
+++ b/targets/thingplus-rp2040.json
@@ -2,7 +2,6 @@
     "inherits": [
         "rp2040"
     ],
-    "serial": "uart",
     "serial-port": ["acm:1b4f:0026"],
     "build-tags": ["thingplus_rp2040"],
     "linkerscript": "targets/thingplus-rp2040.ld",
diff --git a/targets/xiao-rp2040.json b/targets/xiao-rp2040.json
index 96104396..0884bc9f 100644
--- a/targets/xiao-rp2040.json
+++ b/targets/xiao-rp2040.json
@@ -2,7 +2,7 @@
     "inherits": [
         "rp2040"
     ],
-    "serial": "uart",
+    "serial-port": ["acm:2e8a:000a"],
     "build-tags": ["xiao_rp2040"],
     "linkerscript": "targets/xiao-rp2040.ld",
     "extra-files": [