diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2839ba02b..86917c8d6 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,6 +6,7 @@
   - [ ] The pull request is done against the latest dev branch
   - [ ] Only relevant files were touched
   - [ ] Only one feature/fix was added per PR.
-  - [ ] The code change is tested and works on core Tasmota_core_stage
+  - [ ] The code change is tested and works on core Tasmota_core
+  - [ ] The code change is tested and works on core ESP32
   - [ ] The code change pass travis tests. **Your PR cannot be merged unless tests pass**
   - [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla).
diff --git a/platformio.ini b/platformio.ini
index f29d5f363..7be94333c 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -107,14 +107,14 @@ build_flags               = -DUSE_IR_REMOTE_FULL
                             -DDECODE_PRONTO=false -DSEND_PRONTO=false
 
 [core_active]
-platform                  = ${tasmota_core_stage.platform}
-platform_packages         = ${tasmota_core_stage.platform_packages}
-build_flags               = ${tasmota_core_stage.build_flags}
+platform                  = ${tasmota_core.platform}
+platform_packages         = ${tasmota_core.platform_packages}
+build_flags               = ${tasmota_core.build_flags}
 
-[tasmota_core_stage]
-; *** Esp8266 core for Arduino version stable beta
+[tasmota_core]
+; *** Esp8266 Arduino core version Tasmota
 platform                  = espressif8266@2.4.0
-platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#372a3ec297dfe8501bed1ec4552244695b5e8ced
+platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#36e047e908cfa6eafaaf824988070b49f2c2ff2a
 build_flags               = ${esp82xx_defaults.build_flags}
                             -DBEARSSL_SSL_BASIC
 ; NONOSDK22x_190703 = 2.2.2-dev(38a443e)