diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 03bd39b60..7685d45f3 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -40,14 +40,20 @@ lib_extra_dirs          = lib/libesp32, lib/lib_basic
 extends                 = env:tasmota32
 board                   = odroid_esp32
 board_build.f_cpu       = 240000000L
+board_build.flash_mode  = qio
+board_build.f_flash     = 80000000L
+upload_speed            = 2000000
 board_build.partitions  = esp32_partition_app1984k_spiffs12M.csv
 build_flags             = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -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
-board                   = m5stack-grey
+board                   = odroid_esp32
 board_build.f_cpu       = 240000000L
+board_build.flash_mode  = qio
+board_build.f_flash     = 80000000L
+upload_speed            = 2000000
 board_build.partitions  = esp32_partition_app1984k_spiffs12M.csv
 build_flags             = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -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
diff --git a/tools/Esptool/Odroid_go/Odroid_flash.bat b/tools/Esptool/Odroid_go/Odroid_flash.bat
deleted file mode 100644
index 06891d00c..000000000
--- a/tools/Esptool/Odroid_go/Odroid_flash.bat
+++ /dev/null
@@ -1 +0,0 @@
-esptool.py --chip esp32 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dout --flash_freq 40m --flash_size detect 0x1000 bootloader_dout_40m.bin 0x8000 partitions_spiffs_12M.bin 0xe000 boot_app0.bin 0x10000 tasmota32-odroid.bin
\ No newline at end of file
diff --git a/tools/Esptool/Odroid_go/bootloader_dout_40m.bin b/tools/Esptool/Odroid_go/bootloader_dout_40m.bin
deleted file mode 100644
index 267abf3da..000000000
Binary files a/tools/Esptool/Odroid_go/bootloader_dout_40m.bin and /dev/null differ
diff --git a/tools/Esptool/Odroid_go_and_core2/Core2_flash.bat b/tools/Esptool/Odroid_go_and_core2/Core2_flash.bat
new file mode 100644
index 000000000..b9ba35654
--- /dev/null
+++ b/tools/Esptool/Odroid_go_and_core2/Core2_flash.bat
@@ -0,0 +1 @@
+esptool.py --chip esp32 --baud 2000000 --before default_reset --after hard_reset write_flash -z --flash_mode qio --flash_freq 80m --flash_size detect 0x1000 bootloader_qio_80m.bin 0x8000 partitions_spiffs_12M.bin 0xe000 boot_app0.bin 0x10000 tasmota32-core2.bin
\ No newline at end of file
diff --git a/tools/Esptool/Odroid_go_and_core2/Odroid_flash.bat b/tools/Esptool/Odroid_go_and_core2/Odroid_flash.bat
new file mode 100644
index 000000000..001850a1f
--- /dev/null
+++ b/tools/Esptool/Odroid_go_and_core2/Odroid_flash.bat
@@ -0,0 +1 @@
+esptool.py --chip esp32 --baud 2000000 --before default_reset --after hard_reset write_flash -z --flash_mode qio --flash_freq 80m --flash_size detect 0x1000 bootloader_qio_80m.bin 0x8000 partitions_spiffs_12M.bin 0xe000 boot_app0.bin 0x10000 tasmota32-odroid.bin
\ No newline at end of file
diff --git a/tools/Esptool/Odroid_go/boot_app0.bin b/tools/Esptool/Odroid_go_and_core2/boot_app0.bin
similarity index 100%
rename from tools/Esptool/Odroid_go/boot_app0.bin
rename to tools/Esptool/Odroid_go_and_core2/boot_app0.bin
diff --git a/tools/Esptool/Odroid_go_and_core2/bootloader_qio_80m.bin b/tools/Esptool/Odroid_go_and_core2/bootloader_qio_80m.bin
new file mode 100644
index 000000000..d0a5182b9
Binary files /dev/null and b/tools/Esptool/Odroid_go_and_core2/bootloader_qio_80m.bin differ
diff --git a/tools/Esptool/Odroid_go/partitions_spiffs_12M.bin b/tools/Esptool/Odroid_go_and_core2/partitions_spiffs_12M.bin
similarity index 100%
rename from tools/Esptool/Odroid_go/partitions_spiffs_12M.bin
rename to tools/Esptool/Odroid_go_and_core2/partitions_spiffs_12M.bin