diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
index 40e185937..d4fa5770f 100644
--- a/.github/workflows/build-clang-doxy.yml
+++ b/.github/workflows/build-clang-doxy.yml
@@ -159,6 +159,7 @@ jobs:
           [
             "magtag",
             "metroesp32s2",
+            "metro_esp32s3",
             "feather_esp32s2",
             "feather_esp32s2_tft",
             "feather_esp32s2_reverse_tft",
@@ -570,6 +571,8 @@ jobs:
             "feather_esp32s3_4mbflash_2mbpsram_debug",
             "feather_esp32s3_tft_debug",
             "wippersnapper_feather_esp32s3_reverse_tft_debug",
+            "metroesp32s2_debug",
+            "metro_esp32s3_debug",
           ]
     steps:
       - uses: actions/setup-python@v5
diff --git a/examples/Wippersnapper_NoFS/.metro_esp32s3.test.skip b/examples/Wippersnapper_NoFS/.metro_esp32s3.test.skip
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/examples/Wippersnapper_NoFS/.metro_esp32s3.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/Wippersnapper_NoFS/.metro_esp32s3_debug.test.skip b/examples/Wippersnapper_NoFS/.metro_esp32s3_debug.test.skip
new file mode 100644
index 000000000..139597f9c
--- /dev/null
+++ b/examples/Wippersnapper_NoFS/.metro_esp32s3_debug.test.skip
@@ -0,0 +1,2 @@
+
+
diff --git a/examples/Wippersnapper_NoFS/.metroesp32s2_debug.test.skip b/examples/Wippersnapper_NoFS/.metroesp32s2_debug.test.skip
new file mode 100644
index 000000000..139597f9c
--- /dev/null
+++ b/examples/Wippersnapper_NoFS/.metroesp32s2_debug.test.skip
@@ -0,0 +1,2 @@
+
+
diff --git a/examples/Wippersnapper_demo/.metro_esp32s3.generate b/examples/Wippersnapper_demo/.metro_esp32s3.generate
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/examples/Wippersnapper_demo/.metro_esp32s3.generate
@@ -0,0 +1 @@
+
diff --git a/examples/Wippersnapper_demo/.metro_esp32s3_debug.test.skip b/examples/Wippersnapper_demo/.metro_esp32s3_debug.test.skip
new file mode 100644
index 000000000..139597f9c
--- /dev/null
+++ b/examples/Wippersnapper_demo/.metro_esp32s3_debug.test.skip
@@ -0,0 +1,2 @@
+
+
diff --git a/examples/Wippersnapper_demo/.metroesp32s2_debug.test.skip b/examples/Wippersnapper_demo/.metroesp32s2_debug.test.skip
new file mode 100644
index 000000000..139597f9c
--- /dev/null
+++ b/examples/Wippersnapper_demo/.metroesp32s2_debug.test.skip
@@ -0,0 +1,2 @@
+
+
diff --git a/examples/wippersnapper_debug/.metro_esp32s3.test.skip b/examples/wippersnapper_debug/.metro_esp32s3.test.skip
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/examples/wippersnapper_debug/.metro_esp32s3.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/wippersnapper_debug/.metro_esp32s3_debug.generate b/examples/wippersnapper_debug/.metro_esp32s3_debug.generate
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/examples/wippersnapper_debug/.metro_esp32s3_debug.generate
@@ -0,0 +1 @@
+
diff --git a/examples/wippersnapper_debug/.metroesp32s2_debug.generate b/examples/wippersnapper_debug/.metroesp32s2_debug.generate
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/examples/wippersnapper_debug/.metroesp32s2_debug.generate
@@ -0,0 +1 @@
+
diff --git a/platformio.ini b/platformio.ini
index f0bba3b3d..a17425c17 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -262,6 +262,15 @@ build_flags = -DARDUINO_METRO_ESP32S2 -DBOARD_HAS_PSRAM
 board_build.partitions = tinyuf2-partitions-4MB.csv
 extra_scripts =  pre:rename_usb_config.py
 
+; Adafruit Metro ESP32-S3
+[env:adafruit_metro_esp32s3]
+extends = common:esp32
+board = adafruit_metro_esp32s3
+build_flags = -DARDUINO_METRO_ESP32S3 -DBOARD_HAS_PSRAM
+;set partition to tinyuf2-partitions-16MB.csv as of idf 5.1
+board_build.partitions = tinyuf2-partitions-16MB.csv
+extra_scripts =  pre:rename_usb_config.py
+
 ; Adafruit Funhouse ESP32-S2
 [env:adafruit_funhouse_esp32s2]
 extends = common:esp32
diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h
index b119329a1..37e3db870 100644
--- a/src/Wippersnapper_Boards.h
+++ b/src/Wippersnapper_Boards.h
@@ -51,6 +51,13 @@
 #define STATUS_NEOPIXEL_PIN 45
 #define STATUS_NEOPIXEL_NUM 1
 #define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
+#elif defined(ARDUINO_METRO_ESP32S3)
+#define BOARD_ID "metroesp32s3"
+#define USE_TINYUSB
+#define USE_STATUS_NEOPIXEL
+#define STATUS_NEOPIXEL_PIN 46
+#define STATUS_NEOPIXEL_NUM 1
+#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
 #elif defined(ARDUINO_MAGTAG29_ESP32S2)
 #define BOARD_ID "magtag"
 #define USE_TINYUSB
diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp
index 3d2473748..d99c6098b 100644
--- a/src/provisioning/tinyusb/Wippersnapper_FS.cpp
+++ b/src/provisioning/tinyusb/Wippersnapper_FS.cpp
@@ -14,7 +14,7 @@
  */
 
 #if defined(ARDUINO_MAGTAG29_ESP32S2) || defined(ARDUINO_METRO_ESP32S2) ||     \
-    defined(ARDUINO_FUNHOUSE_ESP32S2) ||                                       \
+    defined(ARDUINO_METRO_ESP32S3) || defined(ARDUINO_FUNHOUSE_ESP32S2) ||     \
     defined(ADAFRUIT_PYPORTAL_M4_TITANO) ||                                    \
     defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) ||   \
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) ||                               \