diff --git a/boards/esp32-cam.json b/boards/esp32-cam.json
index b49fb0d4d..52f9ee817 100644
--- a/boards/esp32-cam.json
+++ b/boards/esp32-cam.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "esp32",
     "partitions": "esp32_partition_app1856k_spiffs320k.csv"
diff --git a/boards/esp32-m5core2.json b/boards/esp32-m5core2.json
index 99d42a6ab..e358f9778 100644
--- a/boards/esp32-m5core2.json
+++ b/boards/esp32-m5core2.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "m5stack_core2",
     "partitions": "esp32_partition_app2944k_spiffs10M.csv"
diff --git a/boards/esp32-odroid.json b/boards/esp32-odroid.json
index ea782c034..a5aca814e 100644
--- a/boards/esp32-odroid.json
+++ b/boards/esp32-odroid.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DARDUINO_ODROID_ESP32 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "odroid_esp32",
     "partitions": "esp32_partition_app2944k_spiffs10M.csv"
diff --git a/boards/esp32_16M.json b/boards/esp32_16M.json
index f94e36493..6ebd73c76 100644
--- a/boards/esp32_16M.json
+++ b/boards/esp32_16M.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DARDUINO_ESP32_DEV -DESP32_16M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "esp32",
     "partitions": "esp32_partition_app2944k_spiffs10M.csv"
diff --git a/boards/esp32_4M.json b/boards/esp32_4M.json
index c55367e2e..91ee508ea 100644
--- a/boards/esp32_4M.json
+++ b/boards/esp32_4M.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DARDUINO_ESP32_DEV -DESP32_4M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "esp32",
     "partitions": "esp32_partition_app1856k_spiffs320k.csv"
diff --git a/boards/esp32_8M.json b/boards/esp32_8M.json
index d52b2c48f..ad13a394f 100644
--- a/boards/esp32_8M.json
+++ b/boards/esp32_8M.json
@@ -7,7 +7,7 @@
     "extra_flags": "-DARDUINO_ESP32_DEV -DESP32_8M",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp32",
     "variant": "esp32",
     "partitions": "esp32_partition_app2944k_spiffs2M.csv"
diff --git a/boards/esp32c3.json b/boards/esp32c3.json
index 9e75d1d96..e4ce02579 100644
--- a/boards/esp32c3.json
+++ b/boards/esp32c3.json
@@ -6,7 +6,7 @@
     "core": "esp32",
     "f_cpu": "160000000L",
     "f_flash": "80000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp32c3",
     "variant": "esp32c3",
     "partitions": "esp32_partition_app1856k_spiffs320k.csv"
diff --git a/boards/esp32s2.json b/boards/esp32s2.json
index 7a714892a..a56828c14 100644
--- a/boards/esp32s2.json
+++ b/boards/esp32s2.json
@@ -6,7 +6,7 @@
     "core": "esp32",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
-    "flash_mode": "dio",
+    "flash_mode": "dout",
     "mcu": "esp32s2",
     "variant": "esp32s2",
     "partitions": "esp32_partition_app1856k_spiffs320k.csv"
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 7ff2a9be9..fbe68f545 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -55,21 +55,18 @@ build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
 [env:tasmota32-webcam]
 extends                 = env:tasmota32_base
 board                   = esp32-cam
-board_build.flash_mode  = qio
 build_flags             = ${env:tasmota32_base.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_WEBCAM
 lib_extra_dirs          = lib/libesp32, lib/lib_basic
 
 [env:tasmota32-odroidgo]
 extends                 = env:tasmota32_base
 board                   = esp32-odroid
-board_build.flash_mode  = qio
 build_flags             = ${env:tasmota32_base.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_ODROID_GO
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display
 
 [env:tasmota32-core2]
 extends                 = env:tasmota32_base
 board                   = esp32-m5core2
-board_build.flash_mode  = qio
 build_flags             = ${env:tasmota32_base.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_M5STACK_CORE2
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio