diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index e9d9eb1f9..e6b747c44 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -10,13 +10,13 @@
 
 [platformio]
 ; For best Gitpod performance remove the ";" in the next line. Needed Platformio files are cached and installed at first run
-;core_dir = .platformio
+core_dir = .platformio
 extra_configs = platformio_tasmota_cenv.ini
 
 ; *** Build/upload environment
 default_envs =
 ; *** Uncomment the line(s) below to select version(s)
-                tasmota
+;                tasmota
 ;                tasmota-debug
 ;                tasmota-ircustom
 ;                tasmota-minimal
@@ -36,6 +36,7 @@ default_envs =
 ;                tasmota32-ir
 ;                tasmota32-ircustom
 ;                tasmota32solo1
+                tasmota32s2
 ;                tasmota32-odroidgo
 ;                tasmota32-core2
 
@@ -176,6 +177,7 @@ build_flags                 = ${common32.build_flags}
 [env:tasmota32s2]
 extends                     = env:tasmota32
 platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/arduino-esp32/releases/download/1.0.5-rc1/esp32-s2-1.0.5-rc1.zip
+                              toolchain-xtensa32 @ https://github.com/Jason2866/platform-espressif32/releases/download/8.4.0/xtensa-esp32-elf-gcc8_4_0-esp-2020r3-linux-amd64.tar.gz
                               platformio/tool-mklittlefs @ ~1.203.200522
                               platformio/tool-esptoolpy @ ~1.30000.0
 build_unflags               = ${esp32_defaults.build_unflags}