diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index bf4914fad..61f9575a1 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -37,8 +37,8 @@ build_flags                 = ${env.build_flags}
 ; *** Tasmota development core version ESP32 IDF3.3.5 / Currently none, same as default
 [env:tasmota32idf3]
 extends                     = env:tasmota32_base
-platform                    = espressif32 @ 3.3.0
-platform_packages           = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.4/tasmota-arduinoespressif32-release_v3.3.5.tar.gz
+platform                    = espressif32 @ 3.3.1
+platform_packages           = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.5/tasmota-arduinoespressif32-release_v3.3.5.tar.gz
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${env:tasmota32_base.build_unflags}
 build_flags                 = ${env:tasmota32_base.build_flags}
@@ -49,7 +49,7 @@ build_flags                 = ${env:tasmota32_base.build_flags}
 extends                     = env:tasmota32_base
 board                       = esp32s2
 platform                    = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/464/framework-arduinoespressif32-master-3dde75d58.tar.gz
+platform_packages           = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${env:tasmota32_base.build_unflags}
                               -Wswitch-unreachable
@@ -75,7 +75,7 @@ lib_ignore                  =
 [env:tasmota32idf4]
 extends                     = env:tasmota32_base
 platform                    = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/464/framework-arduinoespressif32-master-3dde75d58.tar.gz
+platform_packages           = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${env:tasmota32_base.build_unflags}
                               -Wswitch-unreachable
@@ -88,13 +88,6 @@ build_flags                 = ${env:tasmota32_base.build_flags}
                               ;-DUSE_BLE_ESP32
                               ;-DUSE_MI_ESP32
                               ;-DESP32_STAGE=true
-lib_extra_dirs              = lib/libesp32
-                              lib/libesp32_div
-                              lib/libesp32_lvgl
-                              lib/lib_basic
-                              lib/lib_i2c
-                              lib/lib_ssl
-                              lib/lib_display
 
 [env:tasmota32-rangeextender]
 extends                     = env:tasmota32idf4
@@ -132,7 +125,7 @@ build_flags             = ${env:tasmota32_base.build_flags}
 [env:tasmota32solo1-ocd]
 ;build_type              = debug
 extends                 = env:tasmota32_base
-platform_packages       = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.4/tasmota-arduinoespressif32-solo1-release_v3.3.5.tar.gz
+platform_packages       = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.5/tasmota-arduinoespressif32-solo1-release_v3.3.5.tar.gz
                           platformio/tool-esptoolpy @ ~1.30100
                           platformio/tool-mklittlefs @ ~1.203.200522
 board                   = esp32_solo1_4M
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 6104db9d5..c0f5fb9ae 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -98,7 +98,7 @@ lib_extra_dirs          = lib/libesp32, lib/lib_basic
 extends                     = env:tasmota32_base
 board                       = esp32c3
 platform                    = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/464/framework-arduinoespressif32-master-3dde75d58.tar.gz
+platform_packages           = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
                               platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${env:tasmota32_base.build_unflags}
                               -Wswitch-unreachable