diff --git a/.github/workflows/build_esp32.yml b/.github/workflows/build_esp32.yml
index db907dc6c..e413e3001 100644
--- a/.github/workflows/build_esp32.yml
+++ b/.github/workflows/build_esp32.yml
@@ -28,7 +28,6 @@ jobs:
         - 'adafruit_feather_esp32s2_tft'
         - 'adafruit_funhouse_esp32s2'
         - 'adafruit_magtag_29gray'
-        - 'adafruit_matrixportal_s2'
         - 'adafruit_metro_esp32s2'
         - 'adafruit_qtpy_esp32s2'
         - 'artisense_rd00'
@@ -70,6 +69,7 @@ jobs:
         - 'adafruit_feather_esp32s3_nopsram'
         - 'adafruit_feather_esp32s3_reverse_tft'
         - 'adafruit_feather_esp32s3_tft'
+        - 'adafruit_matrixportal_s3'
         - 'adafruit_qtpy_esp32s3'
         - 'bpi_leaf_s3'
         - 'bpi_picow_s3'
diff --git a/ports/espressif/boards/adafruit_matrixportal_s2/sdkconfig b/ports/espressif/boards/adafruit_matrixportal_s2/sdkconfig
deleted file mode 100644
index 33a8c772b..000000000
--- a/ports/espressif/boards/adafruit_matrixportal_s2/sdkconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# Board Specific Config
-
-# Partition Table
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
-
-# Serial flasher config
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
diff --git a/ports/espressif/boards/adafruit_matrixportal_s2/board.cmake b/ports/espressif/boards/adafruit_matrixportal_s3/board.cmake
similarity index 58%
rename from ports/espressif/boards/adafruit_matrixportal_s2/board.cmake
rename to ports/espressif/boards/adafruit_matrixportal_s3/board.cmake
index abbdf7abc..9bac46d64 100644
--- a/ports/espressif/boards/adafruit_matrixportal_s2/board.cmake
+++ b/ports/espressif/boards/adafruit_matrixportal_s3/board.cmake
@@ -1,2 +1,2 @@
 # Apply board specific content here
-set(IDF_TARGET "esp32s2")
+set(IDF_TARGET "esp32s3")
diff --git a/ports/espressif/boards/adafruit_matrixportal_s2/board.h b/ports/espressif/boards/adafruit_matrixportal_s3/board.h
similarity index 88%
rename from ports/espressif/boards/adafruit_matrixportal_s2/board.h
rename to ports/espressif/boards/adafruit_matrixportal_s3/board.h
index 8ca01c975..1465e6f13 100644
--- a/ports/espressif/boards/adafruit_matrixportal_s2/board.h
+++ b/ports/espressif/boards/adafruit_matrixportal_s3/board.h
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef ADAFRUIT_MATRIXPORTAL_ESP32S2_H_
-#define ADAFRUIT_MATRIXPORTAL_ESP32S2_H_
+#ifndef ADAFRUIT_MATRIXPORTAL_ESP32S3_H_
+#define ADAFRUIT_MATRIXPORTAL_ESP32S3_H_
 
 //--------------------------------------------------------------------+
 // Button
@@ -36,14 +36,14 @@
 
 // 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   2
+#define PIN_DOUBLE_RESET_RC   1
 
 //--------------------------------------------------------------------+
 // LED
 //--------------------------------------------------------------------+
 
 // GPIO connected to Neopixel data
-#define NEOPIXEL_PIN          1
+#define NEOPIXEL_PIN          4
 
 // Brightness percentage from 1 to 255
 #define NEOPIXEL_BRIGHTNESS   0x10
@@ -51,8 +51,7 @@
 // Number of neopixels
 #define NEOPIXEL_NUMBER       1
 
-
-// LED for indicator
+// LED for indicator and writing flash
 // If not defined neopixel will be use for flash writing instead
 #define LED_PIN               13
 #define LED_STATE_ON          1
@@ -65,11 +64,11 @@
 #define USB_PID                  0x0125
 
 #define USB_MANUFACTURER         "Adafruit"
-#define USB_PRODUCT              "MatrixPortal ESP32-S2"
+#define USB_PRODUCT              "MatrixPortal S3"
 
 #define UF2_PRODUCT_NAME         USB_MANUFACTURER " " USB_PRODUCT
-#define UF2_BOARD_ID             "ESP32S2-MatrixPortal-revA"
-#define UF2_VOLUME_LABEL         "MATRIXBOOT"
+#define UF2_BOARD_ID             "ESP32-S3-MatrixPortal-revB"
+#define UF2_VOLUME_LABEL         "MATRXS3BOOT"
 #define UF2_INDEX_URL            "https://www.adafruit.com/"
 
 // Use favicon
diff --git a/ports/espressif/boards/adafruit_matrixportal_s3/sdkconfig b/ports/espressif/boards/adafruit_matrixportal_s3/sdkconfig
new file mode 100644
index 000000000..329b9a9f2
--- /dev/null
+++ b/ports/espressif/boards/adafruit_matrixportal_s3/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