diff --git a/metadata/au.id.micolous.farebot.yml b/metadata/au.id.micolous.farebot.yml
index a36434ec79..4174d30cf1 100644
--- a/metadata/au.id.micolous.farebot.yml
+++ b/metadata/au.id.micolous.farebot.yml
@@ -1,11 +1,11 @@
 Categories:
   - Navigation
 License: GPL-3.0-or-later
-WebSite: https://micolous.github.io/metrodroid
-SourceCode: https://github.com/micolous/metrodroid
-IssueTracker: https://github.com/micolous/metrodroid/issues
+WebSite: https://www.metrodroid.org
+SourceCode: https://github.com/metrodroid/metrodroid
+IssueTracker: https://github.com/metrodroid/metrodroid/issues
 Translation: https://hosted.weblate.org/engage/metrodroid/
-Changelog: https://github.com/micolous/metrodroid/wiki/Changelog
+Changelog: https://github.com/metrodroid/metrodroid/wiki/Changelog
 
 AutoName: Metrodroid
 Description: |-
@@ -62,7 +62,7 @@ Description: |-
     Some other agencies’ cards using Cubic Nextfare on Mifare Classic may also work.
 
 RepoType: git
-Repo: https://github.com/micolous/metrodroid
+Repo: https://github.com/metrodroid/metrodroid
 
 Builds:
   - versionName: v2.9.30-fdroid
@@ -100,5 +100,5 @@ Builds:
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
-CurrentVersion: 2.9.34
-CurrentVersionCode: 570
+CurrentVersion: 3.0.0
+CurrentVersionCode: 571