diff --git a/.gitmodules b/.gitmodules
index 6ba3be556..1a99568df 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "boost"]
     path = externals/boost
-    url = https://github.com/PabloMK7/ext-boost.git
+    url = https://github.com/azahar-emu/ext-boost.git
 [submodule "nihstro"]
     path = externals/nihstro
     url = https://github.com/neobrain/nihstro.git
@@ -12,7 +12,7 @@
     url = https://github.com/catchorg/Catch2
 [submodule "dynarmic"]
     path = externals/dynarmic
-    url = https://github.com/PabloMK7/dynarmic.git
+    url = https://github.com/azahar-emu/dynarmic.git
 [submodule "xbyak"]
     path = externals/xbyak
     url = https://github.com/herumi/xbyak.git
@@ -27,7 +27,7 @@
     url = https://github.com/benhoyt/inih.git
 [submodule "libressl"]
     path = externals/libressl
-    url = https://github.com/PabloMK7/ext-libressl-portable.git
+    url = https://github.com/azahar-emu/ext-libressl-portable.git
 [submodule "libusb"]
     path = externals/libusb/libusb
     url = https://github.com/libusb/libusb.git
@@ -36,7 +36,7 @@
     url = https://github.com/mozilla/cubeb
 [submodule "discord-rpc"]
     path = externals/discord-rpc
-    url = https://github.com/PabloMK7/discord-rpc.git
+    url = https://github.com/azahar-emu/discord-rpc.git
 [submodule "cpp-jwt"]
     path = externals/cpp-jwt
     url = https://github.com/arun11299/cpp-jwt.git
@@ -78,19 +78,19 @@
     url = https://github.com/KhronosGroup/Vulkan-Headers
 [submodule "sirit"]
     path = externals/sirit
-    url = https://github.com/PabloMK7/sirit
+    url = https://github.com/azahar-emu/sirit
 [submodule "faad2"]
     path = externals/faad2/faad2
     url = https://github.com/knik0/faad2
 [submodule "library-headers"]
     path = externals/library-headers
-    url = https://github.com/PabloMK7/ext-library-headers.git
+    url = https://github.com/azahar-emu/ext-library-headers.git
 [submodule "libadrenotools"]
     path = externals/libadrenotools
     url = https://github.com/bylaws/libadrenotools
 [submodule "oaknut"]
 	path = externals/oaknut
 	url = https://github.com/merryhime/oaknut.git
-[submodule "lime3ds-compatibility-list"]
+[submodule "compatibility-list"]
 	path = dist/compatibility_list
-	url = https://github.com/Lime3DS/compatibility-list
+	url = https://github.com/azahar-emu/compatibility-list