diff --git a/.gitmodules b/.gitmodules
index c82164f..9f69843 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "pswgcommon"]
 	path = pswgcommon
-	url = git@bitbucket.org:projectswg/pswgcommon.git
+	url = https://github.com/ProjectSWGCore/pswgcommon.git
 [submodule "forwarder"]
 	path = forwarder
-	url = git@bitbucket.org:projectswg/forwarder.git
+	url = https://github.com/ProjectSWGCore/forwarder.git
 [submodule "client-holocore"]
 	path = client-holocore
-	url = git@bitbucket.org:projectswg/client-holocore.git
+	url = https://github.com/ProjectSWGCore/client-holocore.git
diff --git a/forwarder b/forwarder
index ed59c4d..f9fe727 160000
--- a/forwarder
+++ b/forwarder
@@ -1 +1 @@
-Subproject commit ed59c4d74aabce287b7aa1d2aeb4400d9f851156
+Subproject commit f9fe727b259353ee08c1bf388f6cf66c0fe82165