diff --git a/metadata/org.yaxim.androidclient.yml b/metadata/org.yaxim.androidclient.yml
index f3a0f3f4df..9a1a5f31eb 100644
--- a/metadata/org.yaxim.androidclient.yml
+++ b/metadata/org.yaxim.androidclient.yml
@@ -5,10 +5,10 @@ AuthorName: Georg Lukas
 AuthorEmail: georg@op-co.de
 AuthorWebSite: https://op-co.de/blog/
 WebSite: https://yaxim.org/
-SourceCode: https://github.com/ge0rg/yaxim
-IssueTracker: https://github.com/pfleidi/yaxim/issues
+SourceCode: https://github.com/yaxim-org/yaxim
+IssueTracker: https://github.com/yaxim-org/yaxim/issues
 Translation: https://translations.launchpad.net/yaxim/master/+pots/yaxim/
-Changelog: https://raw.githubusercontent.com/ge0rg/yaxim/HEAD/ChangeLog
+Changelog: https://raw.githubusercontent.com/yaxim-org/yaxim/HEAD/ChangeLog
 
 AutoName: yaxim
 Description: |-
@@ -21,7 +21,7 @@ Description: |-
     History and notifications it self-signed certificates need to be accepted.
 
 RepoType: git
-Repo: https://github.com/pfleidi/yaxim.git
+Repo: https://github.com/yaxim-org/yaxim.git
 
 Builds:
   - versionName: 0.7.4
@@ -162,6 +162,6 @@ MaintainerNotes: Legacy with lots of jars, which was allowed back when it was ad
 
 AutoUpdateMode: None
 UpdateCheckMode: HTTP
-UpdateCheckData: https://raw.githubusercontent.com/ge0rg/yaxim/master/AndroidManifest.xml|android:versionCode="([0-9]*)"|.|android:versionCode="([0-9]*)"
+UpdateCheckData: https://raw.githubusercontent.com/yaxim-org/yaxim/master/AndroidManifest.xml|android:versionCode="([0-9]*)"|.|android:versionCode="([0-9]*)"
 CurrentVersion: '62'
 CurrentVersionCode: 62