diff --git a/metadata/de.live.gdev.cherrymusic.txt b/metadata/de.live.gdev.cherrymusic.txt
index 0fedaa4fd0..983ef7c0dd 100644
--- a/metadata/de.live.gdev.cherrymusic.txt
+++ b/metadata/de.live.gdev.cherrymusic.txt
@@ -1,9 +1,9 @@
 Categories:Multimedia,Internet
 License:GPLv3
-Web Site:https://github.com/de-live-gdev/cherrymusic_android/blob/HEAD/README.md
-Source Code:https://github.com/de-live-gdev/cherrymusic_android
-Issue Tracker:https://github.com/de-live-gdev/cherrymusic_android/issues
-Donate:http://de-live-gdev.github.io/about/#donate
+Web Site:https://github.com/gsantner/cherrymusic_android/blob/HEAD/README.md
+Source Code:https://github.com/gsantner/cherrymusic_android
+Issue Tracker:https://github.com/gsantner/cherrymusic_android/issues
+Donate:https://gsantner.github.io/about/#donate
 Bitcoin:1B9ZyYdQoY9BxMe9dRUEKaZbJWsbQqfXU5
 
 Auto Name:Cherry
@@ -16,7 +16,7 @@ See [http://www.fomori.org/cherrymusic/] for more informations.
 .
 
 Repo Type:git
-Repo:https://github.com/de-live-gdev/cherrymusic_android.git
+Repo:https://github.com/gsantner/cherrymusic_android.git
 
 Build:1.0,1
     commit=v1.0
diff --git a/metadata/de.live.gdev.timetracker.txt b/metadata/de.live.gdev.timetracker.txt
index 6b20f09e8e..fc1f98d7e7 100644
--- a/metadata/de.live.gdev.timetracker.txt
+++ b/metadata/de.live.gdev.timetracker.txt
@@ -1,9 +1,9 @@
-Categories:Internet,System
+Categories:Internet,Time
 License:GPLv3
-Web Site:https://github.com/de-live-gdev/kimai-android/blob/HEAD/README.md
-Source Code:https://github.com/de-live-gdev/kimai-android
-Issue Tracker:https://github.com/de-live-gdev/kimai-android/issues
-Donate:http://de-live-gdev.github.io/about/#donate
+Web Site:https://github.com/gsantner/kimai-android/blob/HEAD/README.md
+Source Code:https://github.com/gsantner/kimai-android
+Issue Tracker:https://github.com/gsantner/kimai-android/issues
+Donate:https://gsantner.github.io/about/#donate
 Bitcoin:1B9ZyYdQoY9BxMe9dRUEKaZbJWsbQqfXU5
 
 Auto Name:Kimai
@@ -20,7 +20,7 @@ entries.
 .
 
 Repo Type:git
-Repo:https://github.com/de-live-gdev/kimai-android.git
+Repo:https://github.com/gsantner/kimai-android.git
 
 Build:1.1,7
     commit=v1.1