diff --git a/platformio.ini b/platformio.ini
index c25f2445..d41bc863 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,11 +18,11 @@ extra_scripts =
     scripts/makeweb.py
 
 [env:esp32]
-platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4/platform-espressif32-2.0.4.zip
 framework = arduino
 board = esp32dev
 board_build.f_cpu = 160000000L
-build_flags = -D WEBSOCKET_DISABLED=1
+build_flags = -D WEBSOCKET_DISABLED=1 -fexceptions
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 extra_scripts =
@@ -33,8 +33,8 @@ extra_scripts =
 # https://github.com/Jason2866/esp32-arduino-lib-builder
 
 [env:esp32s2]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-v.2.0.3.zip
-platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4/platform-espressif32-2.0.4.zip
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.4
 framework = arduino
 board = esp32dev
 board_build.mcu = esp32s2
@@ -50,7 +50,7 @@ extra_scripts =
     scripts/makeweb.py
 
 [env:esp32solo]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-solo1-v.2.0.3.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4/platform-espressif32-solo1-2.0.4.zip
 framework = arduino
 board = esp32dev
 board_build.f_cpu = 160000000L