diff --git a/.gitmodules b/.gitmodules
index 0f9962a..a7d336c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,13 @@
 [submodule "ggpyjobs"]
 	path = ggpyjobs
-	url = git@github.com:nickelsen/ggpyjobs.git
-	branch = vagrant
+	url = git@github.com:dsjoerg/ggpyjobs.git
 [submodule "ggtracker"]
 	path = ggtracker
-	url = git@github.com:nickelsen/ggtracker.git
-	branch = vagrant
+	url = git@github.com:dsjoerg/ggtracker.git
 [submodule "esdb"]
 	path = esdb
-	url = git@github.com:nickelsen/esdb.git
-	branch = vagrant
+	url = git@github.com:dsjoerg/esdb.git
 [submodule "sc2reader"]
 	path = sc2reader
-	url = git@github.com:nickelsen/sc2reader.git
-    branch = vagrant
+	url = git@github.com:ggtracker/sc2reader.git
+    branch = upstream
diff --git a/esdb b/esdb
index e1baa3c..b6890c5 160000
--- a/esdb
+++ b/esdb
@@ -1 +1 @@
-Subproject commit e1baa3ccc01517773aef624b2164812150328760
+Subproject commit b6890c53b4c8cb34d571c1b1df2a688e232797e1
diff --git a/ggpyjobs b/ggpyjobs
index 6bfa545..fa0a9aa 160000
--- a/ggpyjobs
+++ b/ggpyjobs
@@ -1 +1 @@
-Subproject commit 6bfa5452ab15ceb5db6c8c9bd819a58685aee3a3
+Subproject commit fa0a9aa97af869b2d15414c8f53fda9b68d84a0d
diff --git a/ggtracker b/ggtracker
index 669b958..38debcb 160000
--- a/ggtracker
+++ b/ggtracker
@@ -1 +1 @@
-Subproject commit 669b9580a78b18594f63e6bcbdd91bbd3f4e4702
+Subproject commit 38debcb98c5d21762bd23a3206b72da58eadddea
diff --git a/sc2reader b/sc2reader
index 5e6e235..504fff2 160000
--- a/sc2reader
+++ b/sc2reader
@@ -1 +1 @@
-Subproject commit 5e6e235fa399dc691519d38faa11d71667b69002
+Subproject commit 504fff2ed926c206b9aa74c70bbc017bb7c40718