diff --git a/platformio.ini b/platformio.ini
index c4057e7d1..44306203e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -82,26 +82,25 @@ lib_deps =
 
 ;
 ; builds for GitHub Actions CI
+; We don't set EMSESP_DEFAULT_BOARD_PROFILE and let the code determine the board type. e.g. with board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
 ;
-; the Web interface is built separately during the GH Action so is skipped (not included in extra_scripts)
+; the Web interface is built separately during the GH Action script, so skipped on these targets
 ;
 [env:ci_s_4M]
-; 4MB ESP32 - using Tasmota - no SSL, no PSRAM - like the BBQKees older S32 models
+; 4MB ESP32 - using Tasmota - no SSL, no PSRAM - like the BBQKees older S32 and E32 models
 extends = espressif32_base_tasmota
 extra_scripts = scripts/rename_fw.py
 board = esp32dev
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
-board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
 
 [env:ci_s_16M]
-; 16MB ESP32 - using Tasmota - no SSL, no PSRAM - like the BBQKees older S32 models
+; 16MB ESP32 - using Tasmota - no SSL, no PSRAM - like the BBQKees some later S32 models
 extends = espressif32_base_tasmota
 extra_scripts = scripts/rename_fw.py
 board = esp32dev
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
 
 [env:ci_s_16M_P]
 ; 16MB ESP32 - with PSRAM - like BBQKees E32V2
@@ -110,7 +109,7 @@ extra_scripts = scripts/rename_fw.py
 board = esp32dev
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="E32V2"'
+board_build.extra_flags = -DBOARD_HAS_PSRAM
 
 [env:ci_s3_16M_P]
 ; 16MB ESP32-S3 - with PSRAM - like BBQKees S3
@@ -120,12 +119,12 @@ board = lolin_s3
 board_build.f_cpu = 240000000L
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
+board_build.extra_flags = -DBOARD_HAS_PSRAM
 
 ;
 ; Direct builds
 ;
-; For board params see jsonb files in https://github.com/platformio/platform-espressif32/tree/master/boards
+; For board params see json files in https://github.com/platformio/platform-espressif32/tree/master/boards
 ;
 
 [env:s_4M]
@@ -133,21 +132,19 @@ extends = espressif32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
-board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
 
 [env:s_asym_4M]
 extends = espressif32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_asym_partition_4M.csv
-board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
 
 [env:s_16M_P]
 extends = espressif32_base
 board = esp32dev
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="E32V2"'
+board_build.extra_flags = -DBOARD_HAS_PSRAM
 
 [env:c3_mini_4M]
 extends = espressif32_base_tasmota
@@ -180,7 +177,7 @@ board_upload.use_1200bps_touch = false
 board_upload.wait_for_upload_port = false
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
+board_build.extra_flags = -DBOARD_HAS_PSRAM
 
 [env:s3_32M_P]
 extends = espressif32_base
@@ -189,7 +186,7 @@ board_build.arduino.memory_type: opi_opi
 board_build.flash_mode = opi
 board_upload.flash_size = 32MB
 board_build.partitions = esp32_partition_32M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
+board_build.extra_flags = -DBOARD_HAS_PSRAM
 
 ; 
 ; Building and testing natively, standalone without an ESP32.