diff --git a/metadata/at.bitfire.davdroid.yml b/metadata/at.bitfire.davdroid.yml
index d02d4500ad..e9d59286c3 100644
--- a/metadata/at.bitfire.davdroid.yml
+++ b/metadata/at.bitfire.davdroid.yml
@@ -14,7 +14,7 @@ Bitcoin: bc1q0hvy0mknt9vce2f9hh829h72n3sht9llaltumk
 AutoName: DAVx⁵
 
 RepoType: git
-Repo: https://gitlab.com/bitfireAT/davx5-ose.git
+Repo: https://github.com/bitfireAT/davx5-ose.git
 
 Builds:
   - versionName: 0.3.2-alpha
@@ -1531,7 +1531,19 @@ Builds:
     gradle:
       - standard
 
+  - versionName: 4.1-ose
+    versionCode: 401000005
+    commit: 32d215b3a40004eba77159a6c378b0cfa7e1e9e7
+    subdir: app
+    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
+    gradle:
+      - standard
+
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags ^v[0-9.]+-ose[0-9]*$
-CurrentVersion: 4.0-ose
-CurrentVersionCode: 400000005
+CurrentVersion: 4.1-ose
+CurrentVersionCode: 401000005
diff --git a/metadata/at.bitfire.icsdroid.yml b/metadata/at.bitfire.icsdroid.yml
index 03fea28feb..cb8a751c7f 100644
--- a/metadata/at.bitfire.icsdroid.yml
+++ b/metadata/at.bitfire.icsdroid.yml
@@ -12,7 +12,7 @@ Bitcoin: 1KSCy7RHztKuhW9fLLaUYqdwdC2iwbejZU
 AutoName: ICSx⁵
 
 RepoType: git
-Repo: https://gitlab.com/bitfireAT/icsx5.git
+Repo: https://github.com/bitfireAT/icsx5.git
 
 Builds:
   - versionName: '0.9'