diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 4d81a7b36..07c9d3974 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -26,9 +26,8 @@ build_flags                 = ${esp_defaults.build_flags}
 
 
 [core32]
-platform                    = espressif32 @ 3.2.0
+platform                    = espressif32 @ 3.3.0
 platform_packages           = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.1/tasmota-arduinoespressif32-release_v3.3.5.tar.gz
-                              platformio/tool-esptoolpy @ ~1.30100
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}
diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index 4b861b1d7..f862a7ed1 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -32,7 +32,7 @@ build_flags                 = ${esp32_defaults.build_flags}
 [env:tasmota32s2]
 extends                     = env:tasmota32_base
 board                       = esp32s2
-platform                    = https://github.com/platformio/platform-espressif32.git#feature/idf-master
+platform                    = espressif32 @ 3.3.0
 platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/307/framework-arduinoespressif32-master-1d7068e4b.tar.gz
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags}
@@ -47,9 +47,8 @@ lib_ignore                  =
 [env:tasmota32c3]
 extends                     = env:tasmota32_base
 board                       = esp32c3
-platform                    = https://github.com/platformio/platform-espressif32
+platform                    = espressif32 @ 3.3.0
 platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/307/framework-arduinoespressif32-master-1d7068e4b.tar.gz
-                              platformio/tool-esptoolpy @ ~1.30100
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags}
                               -Wswitch-unreachable
@@ -70,12 +69,15 @@ lib_ignore                  =
 ; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4.
 [env:tasmota32idf4]
 extends                     = env:tasmota32_base
-platform                    = https://github.com/platformio/platform-espressif32.git#feature/idf-master
+platform                    = espressif32 @ 3.3.0
 platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/307/framework-arduinoespressif32-master-1d7068e4b.tar.gz
                               toolchain-xtensa32 @ ~2.80400.0
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags}
+                              -Wswitch-unreachable
+                              -Wincompatible-pointer-types
 build_flags                 = ${esp32_defaults.build_flags}
+                              -Wno-switch-unreachable
                               ;-DESP32_STAGE=true
 
 ; *** Debug version used for PlatformIO Home Project Inspection