diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1cbe2b2..081fabe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,12 @@ jobs:
             board: esp32:esp32:esp32
             eeprom: true
             softwareserial: false
-            index_url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
+            index_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+          - core: esp32:esp32
+            board: esp32:esp32:esp32
+            eeprom: true
+            softwareserial: false
+            index_url: https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json
           - core: esp8266:esp8266
             board: esp8266:esp8266:huzzah
             eeprom: true
@@ -49,10 +54,10 @@ jobs:
         run: arduino-cli core install --additional-urls "${{ matrix.index_url }}" ${{ matrix.core }}
 
       - name: Install AsyncTCP-esphome
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-AsyncTCP#v2.1.3
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.0.0
 
       - name: Install ESPAsyncTCP-esphome
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncTCP-esphome#v2.0.0
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0
 
       - name: Build CaptivePortal
         run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/CaptivePortal/CaptivePortal.ino"
@@ -75,10 +80,10 @@ jobs:
             opts:
           - platform: espressif32
             board: esp32dev
-            opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0-alpha3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'"
+            opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0-rc1, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'"
           - platform: espressif8266
             board: huzzah
-            opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0-alpha3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'"
+            opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0-rc1, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1'"
 
     steps:
       - name: Checkout
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 06877f5..5af716e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,5 +6,10 @@
   "cSpell.words": [
     "YASOLR"
   ],
-  "cmake.configureOnOpen": false
+  "cmake.configureOnOpen": false,
+  "files.associations": {
+    "*.cps": "javascript",
+    "*.config": "cpp",
+    "compare": "cpp"
+  }
 }
\ No newline at end of file
diff --git a/examples/CaptivePortal/CaptivePortal.ino b/examples/CaptivePortal/CaptivePortal.ino
index f97f142..5681709 100644
--- a/examples/CaptivePortal/CaptivePortal.ino
+++ b/examples/CaptivePortal/CaptivePortal.ino
@@ -34,8 +34,15 @@ public:
 
 
 void setup(){
-  //your other setup stuff...
-  WiFi.softAP("esp-captive");
+  Serial.begin(115200);
+  Serial.println();
+  Serial.println("Configuring access point...");
+
+  if (!WiFi.softAP("esp-captive")) {
+    Serial.println("Soft AP creation failed.");
+    while (1);
+  }
+
   dnsServer.start(53, "*", WiFi.softAPIP());
   server.addHandler(new CaptiveRequestHandler()).setFilter(ON_AP_FILTER);//only when requested from AP
   //more handlers...
diff --git a/library.json b/library.json
index ebff832..4007c83 100644
--- a/library.json
+++ b/library.json
@@ -25,9 +25,9 @@
   ],
   "dependencies": [
     {
-      "owner": "esphome",
-      "name": "AsyncTCP-esphome",
-      "version": "^2.1.3",
+      "owner": "mathieucarbou",
+      "name": "Async TCP",
+      "version": "^3.0.0",
       "platforms": "espressif32"
     },
     {
diff --git a/platformio.ini b/platformio.ini
index 5b3afe4..bcb8f6b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1,11 +1,10 @@
 [env]
 framework = arduino
 
-platform_packages=
-  platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0-alpha3
-  platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1
-
-build_flags = -Wall -Wextra
+build_flags = 
+  -Wall -Wextra
+  -D CONFIG_ARDUHAL_LOG_COLORS
+  -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
 upload_protocol = esptool
 upload_port = /dev/cu.usbserial-0001
@@ -21,11 +20,15 @@ src_dir = examples/CaptivePortal
 ; src_dir = examples/SimpleServer
 
 [env:esp32]
+; platform = espressif32@6.6.0
 platform = espressif32
+platform_packages=
+  platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0-rc1
+  platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1
 board = esp32dev
 lib_deps = 
   bblanchon/ArduinoJson @ 7.0.4
-  esphome/AsyncTCP-esphome @ 2.1.3
+  mathieucarbou/Async TCP @ ^3.0.0
 
 [env:esp8266]
 platform = espressif8266