diff --git a/platformio.ini b/platformio.ini
index f09e92c..e0db5ad 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,7 +14,7 @@ board = esp32dev
 framework = arduino
 
 platform_packages =
-  toolchain-xtensa32 @ https://brunner.ninja/esp32_neuer_gcc_1.tar.gz
+  toolchain-xtensa32 @ https://github.com/0xFEEDC0DE64/esp32-platformio-gcc#v8.4.0
   framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0
 
 lib_deps =
@@ -28,7 +28,7 @@ build_unflags =
   -Os
 
 build_flags =
-  -std=gnu++17
+  -std=gnu++2a
   -O3
 ;  -Werror
   -Wall