diff --git a/platformio.ini b/platformio.ini
index 7be94333c..b748ce0b9 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,7 +18,7 @@ extra_configs = platformio_tasmota_env.ini
 default_envs = 
 ; *** Uncomment by deleting ";" in the line(s) below to select version(s)
 ;                tasmota
-;                tasmota-ircustom     ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big
+;                tasmota-ircustom     
 ;                tasmota-minimal
 ;                tasmota-lite
 ;                tasmota-knx
@@ -112,9 +112,9 @@ platform_packages         = ${tasmota_core.platform_packages}
 build_flags               = ${tasmota_core.build_flags}
 
 [tasmota_core]
-; *** Esp8266 Arduino core version Tasmota
+; *** Esp8266 Arduino core 2.7.0
 platform                  = espressif8266@2.4.0
-platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#36e047e908cfa6eafaaf824988070b49f2c2ff2a
+platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino/releases/download/2.7.0/esp8266-2.7.0.zip
 build_flags               = ${esp82xx_defaults.build_flags}
                             -DBEARSSL_SSL_BASIC
 ; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 3c3ca8cfd..afd1e6a4b 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -70,67 +70,19 @@ extra_scripts             = ${scripts_defaults.extra_scripts}
 ;                            pio/http-uploader.py
 
 [core_active]
-; Select one core set for platform and build_flags
+; Activate only (one set) if you want to override the standard core defined in platformio.ini !!!
 
-;platform                  = ${core_2_6_3.platform}
-;platform_packages         = ${core_2_6_3.platform_packages}
-;build_flags               = ${core_2_6_3.build_flags}
-
-platform                  = ${tasmota_feature_stage.platform}
-platform_packages         = ${tasmota_feature_stage.platform_packages}
-build_flags               = ${tasmota_feature_stage.build_flags}
+;platform                  = ${tasmota_stage.platform}
+;platform_packages         = ${tasmota_stage.platform_packages}
+;build_flags               = ${tasmota_stage.build_flags}
 
 ;platform                  = ${core_stage.platform}
 ;platform_packages         = ${core_stage.platform_packages}
 ;build_flags               = ${core_stage.build_flags}
 
 
-[core_2_6_3]
-; *** Esp8266 core for Arduino version 2.6.3
-platform                  = espressif8266@2.4.0
-platform_packages         =
-build_flags               = ${esp82xx_defaults.build_flags}
-                            -DBEARSSL_SSL_BASIC
-; NONOSDK221
-;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
-; NONOSDK22x_190313
-;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313
-; NONOSDK22x_190703 = 2.2.1+100-dev(38a443e) (Tasmota default) (Firmware 2K smaller than NONOSDK22x_191105)
-                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
-; NONOSDK22x_191024 = 2.2.1+111-dev(5ab15d1)
-;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024
-; NONOSDK22x_191105 = 2.2.1+113-dev(bb83b9b)
-;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105
-; NONOSDK3V0 (known issues)
-;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
-; lwIP 1.4
-;                            -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
-; lwIP 2 - Low Memory
-;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-; lwIP 2 - Higher Bandwidth
-;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
-; lwIP 2 - Higher Bandwidth Low Memory no Features
-;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH
-; lwIP 2 - Higher Bandwidth no Features (Tasmota default)
-                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-; lwIP 2 - Higher Bandwidth IPv6 (use ONLY if you need IPv6, experimental!)
-;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_HIGHER_BANDWIDTH
-; VTABLES in Flash (Tasmota default)
-                            -DVTABLES_IN_FLASH
-; VTABLES in Heap
-;                            -DVTABLES_IN_DRAM
-; VTABLES in IRAM
-;                            -DVTABLES_IN_IRAM
-; enable one option set -> No exception recommended
-; No exception code in firmware
-                            -fno-exceptions
-                            -lstdc++
-; Exception code in firmware /needs much space! 90k
-;                           -fexceptions
-;                           -lstdc++-exc
-
-[tasmota_feature_stage]
-; *** Esp8266 core for Arduino version Tasmota feature stage
+[tasmota_stage]
+; *** Esp8266 core for Arduino version Tasmota stage
 platform                  = espressif8266@2.4.0
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#36e047e908cfa6eafaaf824988070b49f2c2ff2a
 build_flags               = ${esp82xx_defaults.build_flags}
@@ -174,7 +126,7 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ;                           -lstdc++-exc
 
 [core_stage]
-; *** Esp8266 core for Arduino version latest beta
+; *** Esp8266 core for Arduino version latest development version
 platform                  = espressif8266@2.4.0
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
 build_flags               = ${esp82xx_defaults.build_flags}