diff --git a/boards/adafruit_metro_esp32s2.json b/boards/adafruit_metro_esp32s2.json
new file mode 100644
index 000000000..af8df2279
--- /dev/null
+++ b/boards/adafruit_metro_esp32s2.json
@@ -0,0 +1,62 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32s2_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_METRO_ESP32S2",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x239A",
+        "0x80DF"
+      ],
+      [
+        "0x239A",
+        "0x00DF"
+      ],
+      [
+        "0x239A",
+        "0x80E0"
+      ]
+    ],
+    "mcu": "esp32s2",
+    "variant": "adafruit_metro_esp32s2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s2.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Adafruit Metro ESP32-S2",
+  "upload": {
+    "arduino": {
+      "flash_extra_images": [
+        [
+          "0x2d0000",
+          "variants/adafruit_metro_esp32s2/tinyuf2.bin"
+        ]
+      ]
+    },
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://www.adafruit.com/product/4775",
+  "vendor": "Adafruit"
+}
diff --git a/boards/featheresp32-s2.json b/boards/featheresp32-s2.json
index 00bf22d46..bf6f0cbc2 100644
--- a/boards/featheresp32-s2.json
+++ b/boards/featheresp32-s2.json
@@ -4,11 +4,29 @@
       "ldscript": "esp32s2_out.ld"
     },
     "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_ADAFRUIT_FEATHER_ESP32S2_NOPSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
+    "hwids": [
+      [
+        "0x239A",
+        "0x80EB"
+      ],
+      [
+        "0x239A",
+        "0x00EB"
+      ],
+      [
+        "0x239A",
+        "0x80EC"
+      ]
+    ],
     "mcu": "esp32s2",
-    "variant": "esp32s2"
+    "variant": "adafruit_feather_esp32s2"
   },
   "connectivity": [
     "wifi"
@@ -17,13 +35,24 @@
     "openocd_target": "esp32s2.cfg"
   },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Adafruit ESP32-S2 Feather Development Board",
   "upload": {
+    "arduino": {
+      "flash_extra_images": [
+        [
+          "0x2d0000",
+          "variants/adafruit_feather_esp32s2/tinyuf2.bin"
+        ]
+      ]
+    },
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
     "require_upload_port": true,
     "speed": 460800
   },