diff --git a/.gitmodules b/.gitmodules
index 3642376ea..7563c3095 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "pswgcommon"]
 	path = pswgcommon
-	url = https://bitbucket.org/projectswg/pswgcommon.git
+	url = https://github.com/ProjectSWGCore/pswgcommon.git
 [submodule "client-holocore"]
 	path = client-holocore
-	url = https://bitbucket.org/projectswg/client-holocore.git
+	url = https://github.com/ProjectSWGCore/client-holocore.git
diff --git a/client-holocore b/client-holocore
index c544a28eb..38abddab1 160000
--- a/client-holocore
+++ b/client-holocore
@@ -1 +1 @@
-Subproject commit c544a28eb75da2ac764e61da34db7773ea2aa966
+Subproject commit 38abddab1ae085685d36431727aa0cf284e1a95c
diff --git a/pswgcommon b/pswgcommon
index 9c041be3e..d8a230edd 160000
--- a/pswgcommon
+++ b/pswgcommon
@@ -1 +1 @@
-Subproject commit 9c041be3efd1fd4cfab5e19a54e7992f16be99d2
+Subproject commit d8a230edd0dddb8589ed0936310ef0fcd03799e0