diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ed7e2a..23fa18e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,16 +58,16 @@ jobs:
         run: arduino-cli core install --additional-urls "${{ matrix.index_url }}" ${{ matrix.core }}
 
       - name: Install AsyncTCP
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.2.10
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/AsyncTCP#v3.3.2
 
       - name: Install ESPAsyncTCP
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/ESPAsyncTCP#v2.0.0
 
       - name: Install ESPAsyncWebServer
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.3.23
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/ESPAsyncWebServer#v3.6.0
 
       - name: Install ArduinoJson
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/bblanchon/ArduinoJson#v7.2.1
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/bblanchon/ArduinoJson#v7.3.0
 
       - name: Build AccessPoint
         run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/AccessPoint/AccessPoint.ino"
diff --git a/library.json b/library.json
index 083e21b..2c836a8 100644
--- a/library.json
+++ b/library.json
@@ -22,13 +22,13 @@
     {
       "owner": "bblanchon",
       "name": "ArduinoJson",
-      "version": "^7.2.1",
+      "version": "^7.3.0",
       "platforms": ["espressif8266", "espressif32"]
     },
     {
-      "owner": "mathieucarbou",
+      "owner": "ESP32Async",
       "name": "ESPAsyncWebServer",
-      "version": "^3.3.23",
+      "version": "^3.6.0",
       "platforms": ["espressif8266", "espressif32"]
     }
   ]
diff --git a/platformio.ini b/platformio.ini
index 5f7a50f..c39f754 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,8 +16,9 @@ build_flags =
   ; -D DASH_USE_LEGACY_CHART_STORAGE=1
   ; -D DASH_USE_STL_STRING=1
 lib_deps = 
-  bblanchon/ArduinoJson@^7.2.1
-  mathieucarbou/ESPAsyncWebServer@^3.3.23
+  bblanchon/ArduinoJson@^7.3.0
+  ESP32Async/AsyncTCP@^3.3.2
+  ESP32Async/ESPAsyncWebServer@^3.3.23
 upload_protocol = esptool
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder, log2file
@@ -34,6 +35,10 @@ board = esp32-s3-devkitc-1
 [env:esp8266]
 platform = espressif8266
 board = huzzah
+lib_deps = 
+  bblanchon/ArduinoJson@^7.3.0
+  ESP32Async/ESPAsyncTCP@^2.0.0
+  ESP32Async/ESPAsyncWebServer@^3.3.23
 
 ;  CI
 
@@ -52,3 +57,7 @@ board = ${sysenv.PIO_BOARD}
 [env:ci-esp8266]
 platform = espressif8266
 board = ${sysenv.PIO_BOARD}
+lib_deps = 
+  bblanchon/ArduinoJson@^7.3.0
+  ESP32Async/ESPAsyncTCP@^2.0.0
+  ESP32Async/ESPAsyncWebServer@^3.3.23