diff --git a/.github/workflows/build_esp32.yml b/.github/workflows/build_esp32.yml
index e87e7ceb1..4d2871716 100644
--- a/.github/workflows/build_esp32.yml
+++ b/.github/workflows/build_esp32.yml
@@ -93,6 +93,7 @@ jobs:
         - 'smartbeedesigns_bee_motion_s3'
         - 'smartbeedesigns_bee_s3'
         - 'unexpectedmaker_feathers3'
+        - 'unexpectedmaker_nanos3'
         - 'unexpectedmaker_pros3'
         - 'unexpectedmaker_tinys3'
         - 'yd_esp32_s3_n16r8'
diff --git a/ports/espressif/boards/unexpectedmaker_nanos3/board.cmake b/ports/espressif/boards/unexpectedmaker_nanos3/board.cmake
new file mode 100644
index 000000000..c1426c950
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_nanos3/board.cmake
@@ -0,0 +1,2 @@
+# Apply board specific content here
+set(IDF_TARGET "esp32s3")
diff --git a/ports/espressif/boards/unexpectedmaker_nanos3/board.h b/ports/espressif/boards/unexpectedmaker_nanos3/board.h
new file mode 100644
index 000000000..92279d08e
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_nanos3/board.h
@@ -0,0 +1,71 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Ha Thach (tinyusb.org) for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef UNEXPECTEDMAKER_NANOS3_H_
+#define UNEXPECTEDMAKER_NANOS3_H_
+
+//--------------------------------------------------------------------+
+// Button
+//--------------------------------------------------------------------+
+
+// Enter UF2 mode if GPIO is pressed while 2nd stage bootloader indicator
+// is on e.g RGB = Purple. If it is GPIO0, user should not hold this while
+// reset since that will instead run the 1st stage ROM bootloader
+#define PIN_BUTTON_UF2        0
+
+// GPIO that implement 1-bit memory with RC components which hold the
+// pin value long enough for double reset detection.
+// #define PIN_DOUBLE_RESET_RC   47
+
+//--------------------------------------------------------------------+
+// LED
+//--------------------------------------------------------------------+
+
+// GPIO connected to Neopixel data
+#define NEOPIXEL_PIN          41
+
+#define NEOPIXEL_POWER_PIN    42
+#define NEOPIXEL_POWER_STATE  1
+
+// Brightness percentage from 1 to 255
+#define NEOPIXEL_BRIGHTNESS   0x64
+
+// Number of neopixels
+#define NEOPIXEL_NUMBER       1
+
+//--------------------------------------------------------------------+
+// USB UF2
+//--------------------------------------------------------------------+
+
+#define USB_VID           0x303A
+#define USB_PID           0x817B
+#define USB_MANUFACTURER  "Unexpected Maker"
+#define USB_PRODUCT       "NanoS3"
+
+#define UF2_PRODUCT_NAME  USB_MANUFACTURER " " USB_PRODUCT
+#define UF2_BOARD_ID      "ESP32S3-NanoS3-01"
+#define UF2_VOLUME_LABEL  "NANOS3BOOT"
+#define UF2_INDEX_URL     "https://circuitpython.org/board/unexpectedmaker_nanos3/"
+
+#endif
diff --git a/ports/espressif/boards/unexpectedmaker_nanos3/sdkconfig b/ports/espressif/boards/unexpectedmaker_nanos3/sdkconfig
new file mode 100644
index 000000000..329b9a9f2
--- /dev/null
+++ b/ports/espressif/boards/unexpectedmaker_nanos3/sdkconfig
@@ -0,0 +1,7 @@
+# Board Specific Config
+
+# Partition Table
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MB.csv"
+
+# Serial flasher config
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y