diff --git a/platformio.ini b/platformio.ini
index e1506af6..dbbdca43 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -368,8 +368,10 @@ lib_deps =
 
 [esp32s2]
 ;; generic definitions for all ESP32-S2 boards
-platform = espressif32@5.3.0
+platform = espressif32@5.2.0
 platform_packages =
+  toolchain-riscv32-esp @ 8.4.0+2021r2-patch5
+  toolchain-xtensa-esp32s2 @ 8.4.0+2021r2-patch5
 build_flags = -g
   -DARDUINO_ARCH_ESP32 -DESP32    -DS2XSHIT                   ;; WLEDMM
   -DARDUINO_ARCH_ESP32S2
@@ -1812,8 +1814,8 @@ board_build.partitions = tools/WLED_ESP32_8MB.csv
 ;; to ewowi - i'll optimize this entry later, as a few things can be inherited for sure. To softhack: sure ;-)
 [env:esp32s2_tinyUF2_PSRAM_S]
 extends = esp32_4MB_V4_S_base
-platform = ${esp32.platformV4}
-platform_packages = ${esp32.platformV4_packages}
+platform = ${esp32s2.platform}                           ;; using 5.2.0, due to massive connectivity problems on -S2 with 5.3.0
+platform_packages = ${esp32s2.platform_packages}
 
 board = adafruit_qtpy_esp32s2
 board_build.partitions = tools/partitions-4MB_spiffs-tinyuf2.csv ;; this is needed for tinyUF2 bootloader! Filename has to end in "tinyuf2.csv"
@@ -1866,8 +1868,8 @@ monitor_filters = esp32_exception_decoder
 ;; PINs assignments optimized for use with serg74 "mini shield"
 [env:esp32s2_PSRAM_M]
 extends = esp32_4MB_V4_M_base
-platform = ${esp32.platformV4}                           ;; more stable on -S2 than 5.1.1
-platform_packages = ${esp32.platformV4_packages}
+platform = ${esp32s2.platform}                           ;; using 5.2.0, due to massive connectivity problems on -S2 with 5.3.0
+platform_packages = ${esp32s2.platform_packages}
 
 board = lolin_s2_mini
 board_build.partitions = tools/WLED_ESP32_4MB_256KB_FS.csv   ;; 1.8MB firmware, 256KB filesystem (esptool erase_flash needed when changing from "standard WLED" partitions)