diff --git a/.gitmodules b/.gitmodules
index d545d95..fa09393 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "wire-server"]
 	path = wire-server
-	url = https://github.com/mohitrajain/wire-server.git
-	branch = clean-wire-server-docs
+	url = https://github.com/wireapp/wire-server.git
+	branch = develop
diff --git a/build/build_versions.sh b/build/build_versions.sh
index 1d52b6c..68160f1 100644
--- a/build/build_versions.sh
+++ b/build/build_versions.sh
@@ -8,6 +8,7 @@ CURRENT=$(git branch --show-current)
 # using dummy values for user.name and user.email as they are not required for git operations but a requirement for mike to have gh-pages branch
 git config --local user.name "Wire Docs"
 git config --local user.email "wire-docs-author@wire.com"
+git config --local submodule.recurse false
 
 # checking if it is building from a branch
 if [ -n "$CURRENT" ]; then
@@ -59,7 +60,7 @@ git show-ref --tags | while read -r commit tag; do
     git checkout $TAG
     
     # pull the submodule
-    git submodule update --init
+    git submodule update --init wire-server
     
     # Check if tag exists in mike
     if [ -n "${existing_tags[$TAG]}" ]; then
@@ -76,6 +77,9 @@ git show-ref --tags | while read -r commit tag; do
         echo "Tag $TAG does not exist. Deploying..."
         $mike deploy --update-aliases "$TAG" "$commit"
     fi
+
+    # deinit the submodule to avoid issues with the next iteration
+    git submodule deinit -f wire-server
 done
 
 # Set the default tag and create an alias to latest
diff --git a/wire-server b/wire-server
index 0d6a681..6082519 160000
--- a/wire-server
+++ b/wire-server
@@ -1 +1 @@
-Subproject commit 0d6a681d0c899bfb8cc9017b49dc13ef01130a09
+Subproject commit 6082519bfc44a5920a8d26e3c9d5c24f42799cf2