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/README.md b/README.md
index 4c29665..6109844 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,15 @@
 # ggtrackerstack
 Project to run the whole ggtracker stack in vagrant
+
+### Running
+ * Make sure you have vagrant+virtualbox installed on your computer
+ * Run `vagrant up` to create the virtual box
+ * Run `vagrant ssh` to ssh into the vagrant box
+ * Find code in /vagrant
+ * Run the installation and updating steps of the components (ESDB and ggtracker) ([will be automated soon](https://github.com/gravelweb/ggtrackerstack/commit/e3bdbb30d9384d37e8b96692af81cefd5f8a87d2))
+   * ESDB: https://github.com/dsjoerg/esdb#installation-and-setup
+   * ggtracker: https://github.com/dsjoerg/ggtracker#basic-installation-and-updating
+     * Note: You need to run ggtracker webapp like this `ESDB_HOST=172.28.128.3:9292 foreman start` (change ip accordingly)
+ * Set up Amazon AWS S3 buckets for development as described in [esdb/config/s3.yml.example](https://github.com/dsjoerg/esdb/blob/master/config/s3.yml.example) (only dev and test are needed) and set up buckets and credentials accordingly in `esdb/config/s3.yml`.
+ * Set up a hostname for the vagrant box's ip in /etc/hosts - e.g. `172.28.128.3 ggtracker.test` (change ip accordingly)
+ * The app will be on `ggtracker.test` in the browser and uploading should work - otherwise please raise an issue here, so it can be fixed.
diff --git a/esdb b/esdb
index e1baa3c..c5bce2d 160000
--- a/esdb
+++ b/esdb
@@ -1 +1 @@
-Subproject commit e1baa3ccc01517773aef624b2164812150328760
+Subproject commit c5bce2d918c0bc8d46e591857e822181b21ab5d5
diff --git a/ggpyjobs b/ggpyjobs
index 6bfa545..b913a3c 160000
--- a/ggpyjobs
+++ b/ggpyjobs
@@ -1 +1 @@
-Subproject commit 6bfa5452ab15ceb5db6c8c9bd819a58685aee3a3
+Subproject commit b913a3cdf23e9fb12a2d109c3222f62f17649878
diff --git a/ggtracker b/ggtracker
index 669b958..ae0821a 160000
--- a/ggtracker
+++ b/ggtracker
@@ -1 +1 @@
-Subproject commit 669b9580a78b18594f63e6bcbdd91bbd3f4e4702
+Subproject commit ae0821a99470a31d4df5f5f3df4f3a19b4de18ed
diff --git a/sc2reader b/sc2reader
index 5e6e235..4d42147 160000
--- a/sc2reader
+++ b/sc2reader
@@ -1 +1 @@
-Subproject commit 5e6e235fa399dc691519d38faa11d71667b69002
+Subproject commit 4d421471cda8d8605e91d96425445badd36f2e5f