diff --git a/.gitmodules b/.gitmodules
index a331068..ad55941 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "lib/squall"]
-	path = lib/squall
-	url = https://github.com/whoahq/squall
 [submodule "lib/system"]
 	path = lib/system
-	url = https://github.com/whoahq/system
+	url = https://github.com/thunderbrewhq/system.git
+[submodule "lib/squall"]
+	path = lib/squall
+	url = https://github.com/thunderbrewhq/squall.git
diff --git a/lib/squall b/lib/squall
index 3d14119..9d7e30c 160000
--- a/lib/squall
+++ b/lib/squall
@@ -1 +1 @@
-Subproject commit 3d141195362dc7557d09deab5b25c3647ee4764e
+Subproject commit 9d7e30c19832f730b8092d0cafdf48f72e08f81a