diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8189f7d11818a620b326d20a2697dde9c0d1988..b7093f7042806e20a9801841ef274518c14ddebd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
 - build
 
 variables:
-  GIT_SUBMODULE_STRATEGY: normal
+  GIT_SUBMODULE_STRATEGY: recursive
 
 before_script:
 - if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi
diff --git a/.gitmodules b/.gitmodules
index 06b057a0f1b7766a3510c8cbf9e18529352f25dc..7baca207edb24250fcb44d143700d988fa271842 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +1,20 @@
 [submodule "extern/UnifiedNlp"]
 	path = extern/UnifiedNlp
 	url = https://gitlab.e.foundation/e/apps/android_packages_apps_UnifiedNlp
-	branch = master
+	branch = dev
 [submodule "extern/GmsApi"]
 	path = extern/GmsApi
 	url = https://gitlab.e.foundation/e/apps/GmsApi
-	branch = master
+	branch = dev
 [submodule "extern/Wearable"]
 	path = extern/Wearable
 	url = https://gitlab.e.foundation/e/apps/Wearable
-	branch = master
+	branch = dev
 [submodule "extern/GmsLib"]
 	path = extern/GmsLib
 	url = https://gitlab.e.foundation/e/apps/GmsLib
-	bramch = master
+	branch = dev
 [submodule "extern/RemoteDroidGuard"]
 	path = extern/RemoteDroidGuard
 	url = https://gitlab.e.foundation/e/apps/android_packages_apps_RemoteDroidGuard
-	branch = master
+	branch = dev
diff --git a/extern/RemoteDroidGuard b/extern/RemoteDroidGuard
index 821d63193a57a9d60892712a29c5e39211bb60a3..0c5c944a54962a4c60cffa44785a36d7251df635 160000
--- a/extern/RemoteDroidGuard
+++ b/extern/RemoteDroidGuard
@@ -1 +1 @@
-Subproject commit 821d63193a57a9d60892712a29c5e39211bb60a3
+Subproject commit 0c5c944a54962a4c60cffa44785a36d7251df635