diff --git a/.gitmodules b/.gitmodules
index 8e635782..6e3c53d3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "ical4android"]
 	path = ical4android
-	url = https://gitlab.com/bitfireAT/ical4android.git
+	url = https://gitlab.com/tasn/ical4android.git
 [submodule "vcard4android"]
 	path = vcard4android
-	url = https://gitlab.com/bitfireAT/vcard4android.git
+	url = https://gitlab.com/tasn/vcard4android.git
 [submodule "cert4android"]
 	path = cert4android
-	url = https://gitlab.com/bitfireAT/cert4android.git
+	url = https://gitlab.com/tasn/cert4android.git
diff --git a/cert4android b/cert4android
index 9033f39d..e8a95719 160000
--- a/cert4android
+++ b/cert4android
@@ -1 +1 @@
-Subproject commit 9033f39d1f541b62750c2bfa9c93a893d6af2f63
+Subproject commit e8a95719e581749997614d614cb6bf36d43fd7b7
diff --git a/ical4android b/ical4android
index 49fbb684..92ff8d06 160000
--- a/ical4android
+++ b/ical4android
@@ -1 +1 @@
-Subproject commit 49fbb6846153fee5e5cbc71b77e94bef7629936d
+Subproject commit 92ff8d06148737bb35e5ace9a9538943f9bdc81f
diff --git a/vcard4android b/vcard4android
index d6ad012f..42825421 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit d6ad012f11f3cd34fe6cfff3115d9524ba31a0ab
+Subproject commit 42825421c620ec01256f4d3a00030aabe64efca8