diff --git a/platformio.ini b/platformio.ini
index a40fa5f4e..5f8164f95 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2,7 +2,8 @@
 ; override any settings with your own local ones in pio_local.ini
 
 [platformio]
-default_envs = esp32_4M
+; default_envs = esp32_4M
+default_envs = lolin_s3
 ; default_envs = esp32_16M
 ; default_envs = standalone
 
@@ -17,7 +18,6 @@ core_build_flags =
   -D ARDUINO_ARCH_ESP32=1
   -D ESP32=1
   -std=gnu++17
-  ; -Os
 
 core_unbuild_flags = -std=gnu++11 
 ; core_unbuild_flags = -std=gnu++17 
@@ -43,7 +43,6 @@ unbuild_flags =
 platform = espressif32
 ; platform = espressif32@5.2.0
 ; platform = espressif32@5.3.0
-; platform = espressif32@6.0.0
 framework = arduino
 
 [env]
@@ -52,6 +51,7 @@ monitor_raw = yes
 upload_speed = 921600
 build_type = release
 lib_ldf_mode = chain+
+board_build.flash_mode = qio
 
 check_tool = cppcheck, clangtidy
 check_severity = high, medium
@@ -78,7 +78,7 @@ extra_scripts =
 board = esp32dev
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
-build_flags = ${common.build_flags}
+build_flags = ${common.build_flags} -Os
 build_unflags = ${common.unbuild_flags}
 
 [env:esp32_16M]
@@ -127,17 +127,19 @@ board_build.partitions = esp32_partition_4M.csv
 build_flags = ${common.build_flags}
 build_unflags = ${common.unbuild_flags}
 
-[env:esp32s3]
+[env:lolin_s3]
 extends = espressi32_base
 extra_scripts =
   pre:scripts/build_interface.py
   scripts/rename_fw.py
 board = lolin_s3
+board_build.f_cpu = 240000000L
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-build_flags = ${common.build_flags}
+build_flags = ${common.build_flags} -O2
 build_unflags = ${common.unbuild_flags}
-upload_protocol = esptool
+board_upload.use_1200bps_touch = false
+board_upload.wait_for_upload_port = false
 
 ; see https://docs.platformio.org/en/latest/platforms/native.html#id1
 ; to build: pio run -e standalone