diff --git a/platformio.ini b/platformio.ini
index 97e8fe901..53d49d864 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -28,7 +28,7 @@ extra_configs               = platformio_tasmota32.ini
 framework                   = arduino
 board_build.filesystem      = littlefs
 custom_unpack_dir           = unpacked_littlefs
-board_build.flash_mode      = dout
+board                       = esp8266_1M
 platform                    = ${core.platform}
 platform_packages           = ${core.platform_packages}
 build_unflags               = ${core.build_unflags}
@@ -86,7 +86,6 @@ build_flags                 = -DCORE_DEBUG_LEVEL=0
 
 
 [esp82xx_defaults]
-board                       = esp8266_1M
 build_flags                 = ${esp_defaults.build_flags}
                               -DNDEBUG
                               -DFP_IN_IROM
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 0391e8c85..798e12be9 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -11,7 +11,6 @@ board                       = esp32dev
 board_build.filesystem      = ${common.board_build.filesystem}
 custom_unpack_dir           = ${common.custom_unpack_dir}
 board_build.partitions      = esp32_partition_app1856k_spiffs320k.csv
-board_build.flash_mode      = ${common.board_build.flash_mode}
 board_build.f_flash         = ${common.board_build.f_flash}
 board_build.f_cpu           = ${common.board_build.f_cpu}
 monitor_speed               = 115200
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index c0b3e7294..ce3b07144 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -2,9 +2,8 @@
 platform                = ${common.platform}
 platform_packages       = ${common.platform_packages}
 framework               = ${common.framework}
-board                   = ${esp82xx_defaults.board}
+board                   = ${common.board}
 board_build.filesystem  = ${common.board_build.filesystem}
-board_build.flash_mode  = ${common.board_build.flash_mode}
 board_build.f_flash     = ${common.board_build.f_flash}
 board_build.f_cpu       = ${common.board_build.f_cpu}
 build_unflags           = ${common.build_unflags}
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 3a44b2675..5fcce4ee5 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -4,7 +4,6 @@ platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
 board_build.partitions  = ${common32.board_build.partitions}
-board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_flash     = ${common32.board_build.f_flash}
 board_build.f_cpu       = ${common32.board_build.f_cpu}
 monitor_speed           = ${common32.monitor_speed}