diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 681144edc..b09b51e99 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -84,9 +84,10 @@ lib_extra_dirs              = ${library.lib_extra_dirs}
 ;build_unflags               = ${tasmota_stage.build_unflags}
 ;build_flags                 = ${tasmota_stage.build_flags}
 
-;platform_packages           = ${core_stage.platform_packages}
-;build_unflags               = ${core_stage.build_unflags}
-;build_flags                 = ${core_stage.build_flags}
+;
+platform_packages           = ${core_stage.platform_packages}
+build_unflags               = ${core_stage.build_unflags}
+build_flags                 = ${core_stage.build_flags}
 
 
 [tasmota_stage]
@@ -102,7 +103,7 @@ build_flags                 = ${esp82xx_defaults.build_flags}
 ; *** 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.201223
+                              tasmota/toolchain-xtensa @ 5.100200.210303
 build_unflags               = ${esp_defaults.build_unflags}
                               -Wswitch-unreachable
 build_flags                 = ${esp82xx_defaults.build_flags}