diff --git a/platformio.ini b/platformio.ini
index cb943a8e4..6630ae369 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -66,8 +66,6 @@ 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
 check_flags =
@@ -77,7 +75,8 @@ check_flags =
 ; build for GitHub Actions CI
 ; the Web interface is built seperately
 [env:ci]
-extends = espressi32_base_tasmota
+platform = https://github.com/tasmota/platform-espressif32.git
+framework = arduino
 extra_scripts = scripts/rename_fw.py
 board = esp32dev
 board_build.partitions = esp32_partition_4M.csv
@@ -85,7 +84,9 @@ build_flags = ${common.build_flags}
 build_unflags = ${common.unbuild_flags}
 
 [env:ci_s3]
-extends = espressi32_base
+platform = espressif32 @ 6.4.0
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.13/esp32-2.0.13.zip
+framework = arduino
 extra_scripts = scripts/rename_fw.py
 board = lolin_s3
 board_build.f_cpu = 240000000L
@@ -101,30 +102,24 @@ extends = espressi32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
-build_flags =
-  ${common.build_flags}
-  -Os
 
 [env:esp32_4Mplus]
 extends = espressi32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_asym_partition_4M.csv
-build_flags = ${common.build_flags}
 
 [env:esp32_16M]
 extends = espressi32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-build_flags = ${common.build_flags}
 
 [env:lolin_c3_mini]
 extends = espressi32_base_tasmota
 board = lolin_c3_mini
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
-build_flags = ${common.build_flags}
 
 ; lolin C3 mini v1 needs special wifi init.
 ; https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi
@@ -142,7 +137,6 @@ extends = espressi32_base_tasmota
 board = lolin_s2_mini
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
-build_flags = ${common.build_flags}
 
 [env:lolin_s3]
 extends = espressi32_base