diff --git a/Software/src/devboard/webserver/webserver.h b/Software/src/devboard/webserver/webserver.h
index a75ef8fb..86b5a763 100644
--- a/Software/src/devboard/webserver/webserver.h
+++ b/Software/src/devboard/webserver/webserver.h
@@ -6,7 +6,7 @@
 #include "../../include.h"
 #include "../../lib/YiannisBourkelis-Uptime-Library/src/uptime_formatter.h"
 #include "../../lib/ayushsharma82-ElegantOTA/src/ElegantOTA.h"
-#include "../../lib/me-no-dev-AsyncTCP/src/AsyncTCP.h"
+#include "../../lib/mathieucarbou-AsyncTCP/src/AsyncTCP.h"
 #include "../../lib/me-no-dev-ESPAsyncWebServer/src/ESPAsyncWebServer.h"
 #include "../../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
 
diff --git a/Software/src/lib/ayushsharma82-ElegantOTA/src/ElegantOTA.h b/Software/src/lib/ayushsharma82-ElegantOTA/src/ElegantOTA.h
index f8770a07..48833d99 100644
--- a/Software/src/lib/ayushsharma82-ElegantOTA/src/ElegantOTA.h
+++ b/Software/src/lib/ayushsharma82-ElegantOTA/src/ElegantOTA.h
@@ -64,7 +64,7 @@ _____ _                        _    ___ _____  _
   #include "Update.h"
   #include "StreamString.h"
   #if ELEGANTOTA_USE_ASYNC_WEBSERVER == 1
-    #include "../../me-no-dev-AsyncTCP/src/AsyncTCP.h"
+    #include "../../mathieucarbou-AsyncTCP/src/AsyncTCP.h"
     #include "../../me-no-dev-ESPAsyncWebServer/src/ESPAsyncWebServer.h"
     #define ELEGANTOTA_WEBSERVER AsyncWebServer
   #else
diff --git a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncEventSource.h b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncEventSource.h
index d3d1b1d4..94a0c51e 100644
--- a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncEventSource.h
+++ b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncEventSource.h
@@ -22,7 +22,7 @@
 
 #include <Arduino.h>
 #ifdef ESP32
-#include "../../me-no-dev-AsyncTCP/src/AsyncTCP.h"
+#include "../../mathieucarbou-AsyncTCP/src/AsyncTCP.h"
 #define SSE_MAX_QUEUED_MESSAGES 32
 #else
 #include <ESPAsyncTCP.h>
diff --git a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSocket.h b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSocket.h
index 747399b8..2ef8f9ec 100644
--- a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSocket.h
+++ b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSocket.h
@@ -23,7 +23,7 @@
 
 #include <Arduino.h>
 #ifdef ESP32
-#include "../../me-no-dev-AsyncTCP/src/AsyncTCP.h"
+#include "../../mathieucarbou-AsyncTCP/src/AsyncTCP.h"
 #define WS_MAX_QUEUED_MESSAGES 32
 #else
 #include <ESPAsyncTCP.h>
diff --git a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/ESPAsyncWebServer.h b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/ESPAsyncWebServer.h
index 664c0a5c..7731a14c 100644
--- a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/ESPAsyncWebServer.h
+++ b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/ESPAsyncWebServer.h
@@ -30,10 +30,10 @@
 
 #ifdef ESP32
 #include <WiFi.h>
-#include "../../me-no-dev-AsyncTCP/src/AsyncTCP.h"
+#include "../../mathieucarbou-AsyncTCP/src/AsyncTCP.h"
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
-#include "../../me-no-dev-AsyncTCP/src/AsyncTCP.h"
+#include "../../mathieucarbou-AsyncTCP/src/AsyncTCP.h"
 #else
 #error Platform not supported
 #endif