diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index d4dceabb5..9b2637244 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -89,6 +89,7 @@ lib_extra_dirs              = ${library.lib_extra_dirs}
 [tasmota_stage]
 ; *** Esp8266 core for Arduino version Tasmota stage (PR7231 and Backport PR7514)
 platform_packages           = framework-arduinoespressif8266@https://github.com/Jason2866/Arduino.git#2.7.4.4
+                              platformio/tool-esptool @ 1.413.0
 build_unflags               = ${esp_defaults.build_unflags}
 build_flags                 = ${esp82xx_defaults.build_flags}
 
@@ -122,14 +123,15 @@ build_flags                 = ${esp82xx_defaults.build_flags}
 ;                            -lstdc++-exc
 
 [core_stage]
-; *** Esp8266 core version. Tasmota stage or Arduino stage version. Built with GCC 10.1 toolchain
-platform_packages           = framework-arduinoespressif8266 @ https://github.com/Jason2866/platform-espressif8266/releases/download/2.9.1/framework-arduinoespressif8266-3.20901.0.tar.gz
-                            ;framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
-                            toolchain-xtensa @ ~2.100100.0
+; *** Esp8266 core for Arduino version stage
+platform_packages           = framework-arduinoespressif8266@https://github.com/esp8266/Arduino.git
+; *** Use Xtensa build chain 10.2. GNU13 from https://github.com/earlephilhower/esp-quick-toolchain
+                              mcspr/toolchain-xtensa@5.100200.200918
+                              platformio/tool-esptool @ 1.413.0
 build_unflags               = ${esp_defaults.build_unflags}
-                            -Wswitch-unreachable
+                              -Wswitch-unreachable
 build_flags                 = ${esp82xx_defaults.build_flags}
-                            -Wno-switch-unreachable
+                              -Wno-switch-unreachable
 
 ; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221