diff --git a/boards/esp32s3_opi_opi.json b/boards/esp32s3_opi_opi.json
new file mode 100644
index 00000000..32b97565
--- /dev/null
+++ b/boards/esp32s3_opi_opi.json
@@ -0,0 +1,44 @@
+{
+    "build": {
+        "arduino": {
+            "ldscript": "esp32s3_out.ld",
+            "memory_type": "opi_opi"
+        },
+        "boot": "opi",
+        "psram_type": "opi",
+        "core": "esp32",
+        "extra_flags": [
+            "-DARDUINO_RUNNING_CORE=1",
+            "-DARDUINO_EVENT_RUNNING_CORE=1",
+            "-DBOARD_HAS_PSRAM",
+            "-DARDUINO_ESP32S3_CAM_LCD",
+            "-DARDUINO_USB_MODE=1"
+        ],
+        "f_cpu": "240000000L",
+        "f_flash": "80000000L",
+        "flash_mode": "qio",
+        "mcu": "esp32s3",
+        "variant": "esp32s3",
+        "partitions": "esp32_partition_app1856k_spiffs320k.csv"
+    },
+    "connectivity": [
+        "wifi"
+    ],
+    "debug": {
+        "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+        "espidf",
+        "arduino"
+    ],
+    "name": "Espressif Generic ESP32-S3 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
+    "upload": {
+        "flash_size": "4MB",
+        "maximum_ram_size": 327680,
+        "maximum_size": 16777216,
+        "require_upload_port": true,
+        "speed": 921600
+    },
+    "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/",
+    "vendor": "Espressif"
+}
\ No newline at end of file
diff --git a/boards/esp32s3_opi_qspi.json b/boards/esp32s3_opi_qspi.json
new file mode 100644
index 00000000..85314810
--- /dev/null
+++ b/boards/esp32s3_opi_qspi.json
@@ -0,0 +1,44 @@
+{
+    "build": {
+        "arduino": {
+            "ldscript": "esp32s3_out.ld",
+            "memory_type": "opi_qspi"
+        },
+        "boot": "opi",
+        "psram_type": "qspi",
+        "core": "esp32",
+        "extra_flags": [
+            "-DARDUINO_RUNNING_CORE=1",
+            "-DARDUINO_EVENT_RUNNING_CORE=1",
+            "-DBOARD_HAS_PSRAM",
+            "-DARDUINO_ESP32S3_CAM_LCD",
+            "-DARDUINO_USB_MODE=1"
+        ],
+        "f_cpu": "240000000L",
+        "f_flash": "80000000L",
+        "flash_mode": "qio",
+        "mcu": "esp32s3",
+        "variant": "esp32s3",
+        "partitions": "esp32_partition_app1856k_spiffs320k.csv"
+    },
+    "connectivity": [
+        "wifi"
+    ],
+    "debug": {
+        "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+        "espidf",
+        "arduino"
+    ],
+    "name": "Espressif Generic ESP32-S3 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
+    "upload": {
+        "flash_size": "4MB",
+        "maximum_ram_size": 327680,
+        "maximum_size": 16777216,
+        "require_upload_port": true,
+        "speed": 921600
+    },
+    "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/",
+    "vendor": "Espressif"
+}
\ No newline at end of file
diff --git a/boards/esp32s3_qio_opi.json b/boards/esp32s3_qio_opi.json
new file mode 100644
index 00000000..d96c43cd
--- /dev/null
+++ b/boards/esp32s3_qio_opi.json
@@ -0,0 +1,44 @@
+{
+    "build": {
+        "arduino": {
+            "ldscript": "esp32s3_out.ld",
+            "memory_type": "qio_opi"
+        },
+        "boot": "qio",
+        "psram_type": "opi",
+        "core": "esp32",
+        "extra_flags": [
+            "-DARDUINO_RUNNING_CORE=1",
+            "-DARDUINO_EVENT_RUNNING_CORE=1",
+            "-DBOARD_HAS_PSRAM",
+            "-DARDUINO_ESP32S3_CAM_LCD",
+            "-DARDUINO_USB_MODE=1"
+        ],
+        "f_cpu": "240000000L",
+        "f_flash": "80000000L",
+        "flash_mode": "qio",
+        "mcu": "esp32s3",
+        "variant": "esp32s3",
+        "partitions": "esp32_partition_app1856k_spiffs320k.csv"
+    },
+    "connectivity": [
+        "wifi"
+    ],
+    "debug": {
+        "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+        "espidf",
+        "arduino"
+    ],
+    "name": "Espressif Generic ESP32-S3 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
+    "upload": {
+        "flash_size": "4MB",
+        "maximum_ram_size": 327680,
+        "maximum_size": 16777216,
+        "require_upload_port": true,
+        "speed": 921600
+    },
+    "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/",
+    "vendor": "Espressif"
+}
\ No newline at end of file
diff --git a/boards/esp32s3_qio_qspi.json b/boards/esp32s3_qio_qspi.json
new file mode 100644
index 00000000..72d66976
--- /dev/null
+++ b/boards/esp32s3_qio_qspi.json
@@ -0,0 +1,44 @@
+{
+    "build": {
+        "arduino": {
+            "ldscript": "esp32s3_out.ld",
+            "memory_type": "qio_qspi"
+        },
+        "boot": "qio",
+        "psram_type": "qspi",
+        "core": "esp32",
+        "extra_flags": [
+            "-DARDUINO_RUNNING_CORE=1",
+            "-DARDUINO_EVENT_RUNNING_CORE=1",
+            "-DBOARD_HAS_PSRAM",
+            "-DARDUINO_ESP32S3_CAM_LCD",
+            "-DARDUINO_USB_MODE=1"
+        ],
+        "f_cpu": "240000000L",
+        "f_flash": "80000000L",
+        "flash_mode": "qio",
+        "mcu": "esp32s3",
+        "variant": "esp32s3",
+        "partitions": "esp32_partition_app1856k_spiffs320k.csv"
+    },
+    "connectivity": [
+        "wifi"
+    ],
+    "debug": {
+        "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+        "espidf",
+        "arduino"
+    ],
+    "name": "Espressif Generic ESP32-S3 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
+    "upload": {
+        "flash_size": "4MB",
+        "maximum_ram_size": 327680,
+        "maximum_size": 16777216,
+        "require_upload_port": true,
+        "speed": 921600
+    },
+    "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/",
+    "vendor": "Espressif"
+}
\ No newline at end of file
diff --git a/user_setups/esp32s3/gs-t3e.ini b/user_setups/esp32s3/gs-t3e.ini
index 5c498b34..cf3dbb31 100644
--- a/user_setups/esp32s3/gs-t3e.ini
+++ b/user_setups/esp32s3/gs-t3e.ini
@@ -1,11 +1,11 @@
 ;***************************************************;
-;         GS-T3E with TFT 3.95"                     ;
+;         Generic T3E with TFT 3.95"                ;
 ;               - Custom esp32-s3 board             ;
 ;               - st7701s TFT                       ;
 ;               - gt911 touch controller            ;
 ;***************************************************;
 
-[gs-t3e]
+[odm-t3e]
 ;board = esp32-s3-devkitc-1
 board = esp32s3_qio_opi
 
@@ -63,8 +63,5 @@ lib_ignore =
 ;endregion
 
 
-;[env:gs-t3e_8MB]
-;extends = gs-t3e, esp32s3_8mb_v2
-
 [env:gs-t3e_16MB]
-extends = gs-t3e, esp32s3_16mb_v2
\ No newline at end of file
+extends = odm-t3e, esp32s3_16mb_v2
\ No newline at end of file