diff --git a/boards/lilygo-t7-s3.json b/boards/lilygo-t7-s3.json
new file mode 100644
index 00000000..4bf071fc
--- /dev/null
+++ b/boards/lilygo-t7-s3.json
@@ -0,0 +1,47 @@
+{
+    "build": {
+        "arduino":{
+            "ldscript": "esp32s3_out.ld",
+            "memory_type": "qio_opi",
+            "partitions": "default_16MB.csv"
+        },
+        "core": "esp32",
+        "extra_flags": [
+			"-DARDUINO_TTGO_T7_S3",
+            "-DBOARD_HAS_PSRAM",
+            "-DARDUINO_USB_MODE=1"
+        ],
+        "f_cpu": "240000000L",
+        "f_flash": "80000000L",
+        "flash_mode": "qio",
+        "hwids": [
+            [
+                "0X303A",
+                "0x1001"
+            ]
+        ],
+        "mcu": "esp32s3",
+        "variant": "esp32s3"
+    },
+    "connectivity": [
+        "wifi",
+        "bluetooth"
+    ],
+    "debug": {
+        "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+        "arduino",
+        "espidf"
+    ],
+    "name": "LILYGO T3-S3",
+    "upload": {
+        "flash_size": "16MB",
+        "maximum_ram_size": 327680,
+        "maximum_size": 16777216,
+        "require_upload_port": true,
+        "speed": 921600
+    },
+    "url": "https://www.aliexpress.us/item/3256804591247074.html",
+    "vendor": "LILYGO"
+}
\ No newline at end of file
diff --git a/platformio_override.ini b/platformio_override.ini
index 2ccfc3a6..87d1975e 100644
--- a/platformio_override.ini
+++ b/platformio_override.ini
@@ -54,8 +54,7 @@ monitor_filters = esp32_exception_decoder
 
 [env:esp32S3_PSRAM_HUB75]
 ;; MOONHUB HUB75 adapter board
-board = lolin_s3_mini
-; lilygo-t7-s3
+board = lilygo-t7-s3
 platform = ${esp32s3.platform}
 platform_packages =
 upload_speed = 921600
diff --git a/platformio_override.sample.ini b/platformio_override.sample.ini
index a9ad6f23..360d4232 100644
--- a/platformio_override.sample.ini
+++ b/platformio_override.sample.ini
@@ -630,8 +630,7 @@ monitor_filters = esp32_exception_decoder
 
 [env:esp32S3_PSRAM_HUB75]
 ;; MOONHUB HUB75 adapter board
-board = lolin_s3_mini
-; lilygo-t7-s3
+board = lilygo-t7-s3
 platform = ${esp32s3.platform}
 platform_packages =
 upload_speed = 921600
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 42d1e997..3febcbc9 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -855,6 +855,19 @@ BusHub75Matrix::BusHub75Matrix(const BusConfig &bc) : Bus(bc.type, bc.start, bc.
   DEBUGBUS_PRINTLN("MatrixPanel_I2S_DMA - Matrix Portal S3 config");
   mxconfig.gpio = { 42, 41, 40, 38, 39, 37,  45, 36, 48, 35, 21, 47, 14, 2 };
 
+#elif defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)// ESP32-S3 with PSRAM
+
+#if defined(MOONHUB_S3_PINOUT)
+  DEBUGBUS_PRINTLN("MatrixPanel_I2S_DMA - T7 S3 with PSRAM, MOONHUB pinout");
+
+  // HUB75_I2S_CFG::i2s_pins _pins={R1_PIN, G1_PIN, B1_PIN, R2_PIN, G2_PIN, B2_PIN, A_PIN, B_PIN, C_PIN, D_PIN, E_PIN, LAT_PIN, OE_PIN, CLK_PIN};
+  mxconfig.gpio = { 1, 5, 6, 7, 13, 9, 16, 48, 47, 21, 38, 8, 4, 18 };
+
+#else
+  DEBUGBUS_PRINTLN("MatrixPanel_I2S_DMA - S3 with PSRAM");
+  // HUB75_I2S_CFG::i2s_pins _pins={R1_PIN, G1_PIN, B1_PIN, R2_PIN, G2_PIN, B2_PIN, A_PIN, B_PIN, C_PIN, D_PIN, E_PIN, LAT_PIN, OE_PIN, CLK_PIN};
+  mxconfig.gpio = {1, 2, 42, 41, 40, 39, 45, 48, 47, 21, 38, 8, 3, 18};
+#endif
 #elif defined(ESP32_FORUM_PINOUT) // Common format for boards designed for SmartMatrix
 
   DEBUGBUS_PRINTLN("MatrixPanel_I2S_DMA - ESP32_FORUM_PINOUT");