diff --git a/bin/bin ESP32-S3-LCD-147/0x0000_bootloader.bin b/bin/bin ESP32-S3-LCD-147/0x0000_bootloader.bin
new file mode 100644
index 00000000..27d593a4
Binary files /dev/null and b/bin/bin ESP32-S3-LCD-147/0x0000_bootloader.bin differ
diff --git a/bin/bin ESP32-S3-LCD-147/0x10000_firmware.bin b/bin/bin ESP32-S3-LCD-147/0x10000_firmware.bin
new file mode 100644
index 00000000..a9c9a7da
Binary files /dev/null and b/bin/bin ESP32-S3-LCD-147/0x10000_firmware.bin differ
diff --git a/bin/bin ESP32-S3-LCD-147/0x8000_partitions.bin b/bin/bin ESP32-S3-LCD-147/0x8000_partitions.bin
new file mode 100644
index 00000000..1954582f
Binary files /dev/null and b/bin/bin ESP32-S3-LCD-147/0x8000_partitions.bin differ
diff --git a/lib/TFT_eSPI/User_Setup_Select.h b/lib/TFT_eSPI/User_Setup_Select.h
index f61df74d..624f76cf 100644
--- a/lib/TFT_eSPI/User_Setup_Select.h
+++ b/lib/TFT_eSPI/User_Setup_Select.h
@@ -161,6 +161,9 @@
 #ifdef NERDMINER_S3_GEEK
 #include <User_Setups/Setup303_WaveShare ESP32S3_GEEK.h>            // Setup file for Waveshare Setup303_WaveShare ESP32S3_GEEK with ST7789 135*240 TFT
 #endif
+#ifdef NERDMINER_S3_LCD_147
+#include <User_Setups/Setup305_WaveShare_ESP32S3_LCD_147.h>         // Setup file for Waveshare ESP32-S3-LCD-1.47 with ST7789 172*320 TFT
+#endif
 
 // #include <User_Setups/Setup212_LilyGo_T_PicoPro.h>         // For the LilyGo T-PICO-Pro with ST7796 222 x 480 TFT
 // #include <User_Setups/Setup213_LilyGo_T_Beam_Shield.h>         // For the LilyGo T-BEAM V1.x with ST7796 222 x 480 TFT
diff --git a/lib/TFT_eSPI/User_Setups/Setup305_WaveShare_ESP32S3_LCD_147.h b/lib/TFT_eSPI/User_Setups/Setup305_WaveShare_ESP32S3_LCD_147.h
new file mode 100644
index 00000000..706a2caa
--- /dev/null
+++ b/lib/TFT_eSPI/User_Setups/Setup305_WaveShare_ESP32S3_LCD_147.h
@@ -0,0 +1,33 @@
+// Waveshare ESP32-S3-LCD-1.47 with ST7789 172x320 display
+
+#define USER_SETUP_ID 305
+
+#define ST7789_DRIVER
+
+#define TFT_WIDTH  172
+#define TFT_HEIGHT 320
+
+#define CGRAM_OFFSET
+
+#define TFT_RGB_ORDER TFT_BGR
+
+#define TFT_INVERSION_ON
+
+#define TFT_MOSI 45
+#define TFT_SCLK 40
+#define TFT_CS   42
+#define TFT_DC   41
+#define TFT_RST  39
+#define TFT_BL   48
+
+#define LOAD_GLCD
+#define LOAD_FONT2
+#define LOAD_FONT4
+#define LOAD_FONT6
+#define LOAD_FONT7
+#define LOAD_FONT8
+#define LOAD_GFXFF
+
+#define SMOOTH_FONT
+
+#define SPI_FREQUENCY  40000000
diff --git a/platformio.ini b/platformio.ini
index 8f8b9f24..a33221bd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -822,7 +822,7 @@ extra_scripts =
     pre:auto_firmware_version.py
     post:post_build_merge.py
 board_build.partitions = huge_app.csv
-build_flags = 
+build_flags =
     -DNERDMINER_S3_GEEK
     -DBOARD_HAS_PSRAM
     -DARDUINO_USB_CDC_ON_BOOT
@@ -832,13 +832,40 @@ build_flags =
     -DSDSPI_MISO=37
     -DSDSPI_CS=34
     -DSD_ID=HSPI
-lib_deps = 
+lib_deps =
 	https://github.com/takkaO/OpenFontRender#v1.2
 	bblanchon/ArduinoJson@^6.21.5
 	https://github.com/tzapu/WiFiManager.git#v2.0.17
 	mathertel/oneButton@^2.6.1
 	arduino-libraries/NTPClient@^3.2.1
-lib_ignore = 
+lib_ignore =
+	HANSOLOminerv2
+
+;--------------------------------------------------------------------
+
+[env:NerdminerV2-S3-LCD-147]
+platform = espressif32@6.6.0
+board = esp32-s3-devkitc-1
+framework = arduino
+extra_scripts =
+    pre:auto_firmware_version.py
+    post:post_build_merge.py
+board_build.partitions = huge_app.csv
+board_build.arduino.memory_type = qio_opi
+build_flags =
+    -DNERDMINER_S3_LCD_147
+    -DBOARD_HAS_PSRAM
+    -DARDUINO_USB_MODE=1
+    -DARDUINO_USB_CDC_ON_BOOT=1
+    -DTFT_BACKLIGHT_ON=HIGH
+lib_deps =
+	https://github.com/takkaO/OpenFontRender#v1.2
+	bblanchon/ArduinoJson@^6.21.5
+	https://github.com/tzapu/WiFiManager.git#v2.0.17
+	mathertel/oneButton@^2.6.1
+	arduino-libraries/NTPClient@^3.2.1
+	fastled/FastLED@3.7.8
+lib_ignore =
 	HANSOLOminerv2
 
 ;--------------------------------------------------------------------
diff --git a/src/drivers/devices/device.h b/src/drivers/devices/device.h
index 49ec045f..721df71a 100644
--- a/src/drivers/devices/device.h
+++ b/src/drivers/devices/device.h
@@ -49,6 +49,8 @@
 #include "wt32.h"
 #elif defined(NERDMINER_S3_GEEK)
 #include "waveshareS3Geek.h"
+#elif defined(NERDMINER_S3_LCD_147)
+#include "waveshareS3LCD147.h"
 #elif defined(NERDMINER_T_HMI)
 #include "lilygoT_HMI.h"
 #elif defined(SPOTPEAR)
diff --git a/src/drivers/devices/waveshareS3LCD147.h b/src/drivers/devices/waveshareS3LCD147.h
new file mode 100644
index 00000000..b86813e5
--- /dev/null
+++ b/src/drivers/devices/waveshareS3LCD147.h
@@ -0,0 +1,9 @@
+#ifndef _WAVESHARE_S3_LCD_147_H
+#define _WAVESHARE_S3_LCD_147_H
+
+#define PIN_BUTTON_1 0
+#define RGB_LED_PIN 38
+#define ESP32RGB
+#define T_DISPLAY
+
+#endif