diff --git a/metadata/at.bitfire.davdroid.yml b/metadata/at.bitfire.davdroid.yml
index 00153558fc..01bdd03ba1 100644
--- a/metadata/at.bitfire.davdroid.yml
+++ b/metadata/at.bitfire.davdroid.yml
@@ -3,10 +3,9 @@ Categories:
 License: GPL-3.0-only
 AuthorName: bitfire web engineering
 WebSite: https://www.davx5.com/
-SourceCode: https://www.davx5.com/source
-IssueTracker: https://www.davx5.com/forums
+SourceCode: https://github.com/bitfireAT/davx5-ose/
 Translation: https://www.transifex.com/bitfireAT/davx5/
-Changelog: https://forums.bitfire.at/category/4/davx?tag=announcement
+Changelog: https://github.com/bitfireAT/davx5-ose/discussions/categories/announcements
 Donate: https://www.davx5.com/donate
 LiberapayID: '14101'
 Bitcoin: bc1q0hvy0mknt9vce2f9hh829h72n3sht9llaltumk
diff --git a/metadata/at.bitfire.icsdroid.yml b/metadata/at.bitfire.icsdroid.yml
index 79a35e2960..0892dea1a7 100644
--- a/metadata/at.bitfire.icsdroid.yml
+++ b/metadata/at.bitfire.icsdroid.yml
@@ -3,9 +3,8 @@ Categories:
 License: GPL-3.0-only
 AuthorName: bitfire web engineering
 WebSite: https://icsx5.bitfire.at/
-SourceCode: https://icsx5.bitfire.at/source/
-IssueTracker: https://icsx5.bitfire.at/forums/
-Changelog: https://forums.bitfire.at/category/5/icsx?tag=announcement
+SourceCode: https://github.com/bitfireAT/icsx5
+Changelog: https://github.com/bitfireAT/icsx5/discussions/categories/announcements
 Donate: https://icsx5.bitfire.at/donate/
 Bitcoin: 1KSCy7RHztKuhW9fLLaUYqdwdC2iwbejZU