diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index ad669b0a7..6cbd749c4 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -28,6 +28,7 @@ default_envs =
 
 [common]
 platform                  = ${core_active.platform}
+platform_packages         = ${core_active.platform_packages}
 build_flags               = ${core_active.build_flags}
 ; *** Use settings from file user_config_override.h
                           -DUSE_CONFIG_OVERRIDE
@@ -72,6 +73,7 @@ build_flags               = ${core_2_6_1.build_flags}
 ;platform                  = ${core_2_6_2.platform}
 ;build_flags               = ${core_2_6_2.build_flags}
 ;platform                  = ${core_stage.platform}
+;platform_packages         = ${core_stage.platform_packages}
 ;build_flags               = ${core_stage.build_flags}
 
 
@@ -165,7 +167,8 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 [core_stage]
 ; *** Esp8266 core for Arduino version latest beta
-platform                  = https://github.com/platformio/platform-espressif8266.git#feature/stage
+platform                  = espressif8266@2.3.1
+platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
 build_flags               = ${esp82xx_defaults.build_flags}
                             -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index 46e71d7af..38aaf2223 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -1,5 +1,6 @@
 [env]
 platform = ${common.platform}
+platform_packages = ${common.platform_packages}
 framework = ${common.framework}
 board = ${common.board}
 board_build.flash_mode = ${common.board_build.flash_mode}