diff --git a/platformio.ini b/platformio.ini
index 61fd86963..2fe2a578d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -83,8 +83,8 @@ extra_scripts = scripts/rename_fw.py
 board = esp32dev
 board_build.partitions = esp32_partition_4M.csv
 board_build.extra_flags = -DBOARD_HAS_PSRAM
-build_flags = ${common.build_flags}
 build_unflags = ${common.unbuild_flags}
+build_flags = ${common.build_flags}
 
 [env:ci_s3]
 extends = espressi32_base
@@ -93,10 +93,11 @@ board = lolin_s3
 board_build.f_cpu = 240000000L
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
+build_unflags = ${common.unbuild_flags}
 build_flags =
   ${common.build_flags}
   -O2
-build_unflags = ${common.unbuild_flags}
+  '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
 
 [env:esp32_4M]
 extends = espressi32_base_tasmota