diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0de14bbf8..8db216e84 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,7 @@
   - [ ] Only relevant files were touched
   - [ ] Only one feature/fix was added per PR and the code change compiles without warnings
   - [ ] The code change is tested and works on Tasmota core ESP8266 V.2.7.4.9
-  - [ ] The code change is tested and works on Tasmota core ESP32 V.1.0.5-rc6
+  - [ ] The code change is tested and works with core ESP32 V.1.0.5
   - [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla).
 
 _NOTE: The code change must pass CI tests. **Your PR cannot be merged unless tests pass**_
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 0209e7091..1f124264d 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -124,16 +124,16 @@ lib_extra_dirs              = ${library.lib_extra_dirs}
 
 [core32]
 ; Activate Stage Core32 by removing ";" in next 3 lines, if you want to override the standard core32
-platform_packages           = ${core32_stage.platform_packages}
-build_unflags               = ${core32_stage.build_unflags}
-build_flags                 = ${core32_stage.build_flags}
+;platform_packages           = ${core32_stage.platform_packages}
+;build_unflags               = ${core32_stage.build_unflags}
+;build_flags                 = ${core32_stage.build_flags}
 
 [core32_stage]
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/arduino-esp32/releases/download/1.0.5-rc7/esp32-1.0.5-rc7.zip
+platform_packages           = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}
-                              ;-DESP32_STAGE=true
+                              -DESP32_STAGE=true
 
 [library]
 shared_libdeps_dir          = lib
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 8bbbe5d0d..caa655c4f 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -94,8 +94,7 @@ build_flags                 = ${esp_defaults.build_flags}
 
 
 [core32]
-platform                    = espressif32 @ 3.0.0
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/arduino-esp32/releases/download/1.0.5-rc6/esp32-1.0.5-rc6.zip
-                              platformio/tool-mklittlefs @ ~1.203.200522
+platform                    = espressif32 @ 3.1.0
+platform_packages           = platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}