diff --git a/boards/nanorp2040connect.json b/boards/nanorp2040connect.json
index 4e9c594..3122960 100644
--- a/boards/nanorp2040connect.json
+++ b/boards/nanorp2040connect.json
@@ -1,5 +1,15 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "variant": "arduino_nano_connect",
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_pid": "0x0058",
+        "usb_vid": "0x2341",
+        "usb_manufacturer": "Arduino",
+        "usb_product" : "Arduino Nano RP2040 Connect"
+      }
+    },
     "core": "arduino",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_NANO_RP2040_CONNECT -DARDUINO_ARCH_RP2040",
@@ -15,17 +25,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "NANO_RP2040_CONNECT",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "arduino_nano_connect",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_pid": "0x0058",
-        "usb_vid": "0x2341",
-        "usb_manufacturer": "Arduino",
-        "usb_product" : "Arduino Nano RP2040 Connect"
-      }
-    }
+    "variant": "NANO_RP2040_CONNECT"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",
diff --git a/boards/pico.json b/boards/pico.json
index eaec305..55fdfa4 100644
--- a/boards/pico.json
+++ b/boards/pico.json
@@ -1,5 +1,15 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "variant": "rpipico",
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x000a",
+        "usb_manufacturer": "Raspberry Pi",
+        "usb_product": "Pico"        
+      }
+    },
     "core": "arduino",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_RASPBERRY_PI_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
@@ -11,17 +21,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "RASPBERRY_PI_PICO",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "rpipico",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x000a",
-        "usb_manufacturer": "Raspberry Pi",
-        "usb_product": "Pico"        
-      }
-    }
+    "variant": "RASPBERRY_PI_PICO"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",