diff --git a/platformio.ini b/platformio.ini
index fc29bc5e2..4551a164d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -89,9 +89,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags}
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
-upload_resetmethod = ${common.upload_resetmethod}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-minimal]
@@ -102,8 +102,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DBE_MINIMAL
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-classic]
@@ -114,8 +115,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DUSE_CLASSIC
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-knx]
@@ -126,8 +128,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DUSE_KNX_NO_EMULATION
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-allsensors]
@@ -138,8 +141,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DUSE_ALL_SENSORS
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-BG]
@@ -150,8 +154,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-BR]
@@ -162,8 +167,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-CN]
@@ -174,8 +180,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-CZ]
@@ -186,8 +193,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-DE]
@@ -198,8 +206,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-ES]
@@ -210,8 +219,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=es-AR
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-FR]
@@ -222,8 +232,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-GR]
@@ -234,8 +245,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-HU]
@@ -246,8 +258,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-IT]
@@ -258,8 +271,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-NL]
@@ -270,8 +284,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-PL]
@@ -282,8 +297,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-PT]
@@ -294,8 +310,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-RU]
@@ -306,8 +323,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-TR]
@@ -318,8 +336,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=tr-TR
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-TW]
@@ -330,8 +349,9 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:sonoff-UK]
@@ -342,6 +362,7 @@ board_build.flash_mode = ${common.board_build.flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UK
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}