diff --git a/metadata/com.akop.bach.txt b/metadata/com.akop.bach.txt
index 115b4182d5..d981ca02a2 100644
--- a/metadata/com.akop.bach.txt
+++ b/metadata/com.akop.bach.txt
@@ -2,8 +2,8 @@ AntiFeatures:NonFreeNet
 Categories:Games
 License:GPL-3.0-only
 Web Site:
-Source Code:https://github.com/melllvar/Spark360
-Issue Tracker:https://github.com/melllvar/Spark360/issues
+Source Code:https://github.com/0xe1f/Spark360
+Issue Tracker:https://github.com/0xe1f/Spark360/issues
 
 Auto Name:Spark 360
 Summary:Gaming client
@@ -18,7 +18,7 @@ affiliated with Microsoft Corporation or Sony Corporation.
 .
 
 Repo Type:git
-Repo:https://github.com/melllvar/Spark360.git
+Repo:https://github.com/0xe1f/Spark360.git
 
 Build:6.20,116
     commit=v6.20
diff --git a/metadata/fr.keuse.rightsalert.txt b/metadata/fr.keuse.rightsalert.txt
index 52cf67e1f8..092e3c564f 100644
--- a/metadata/fr.keuse.rightsalert.txt
+++ b/metadata/fr.keuse.rightsalert.txt
@@ -1,8 +1,8 @@
 Categories:System
 License:GPL-3.0-only
 Web Site:
-Source Code:https://github.com/cglapa/rights-alert
-Issue Tracker:https://github.com/cglapa/rights-alert/issues
+Source Code:https://github.com/kyriog/rights-alert
+Issue Tracker:https://github.com/kyriog/rights-alert/issues
 
 Auto Name:Rights alert
 Summary:Permissions Reporter
@@ -13,7 +13,7 @@ score, the application is considered as dangerous.
 .
 
 Repo Type:git
-Repo:https://github.com/cglapa/rights-alert.git
+Repo:https://github.com/kyriog/rights-alert.git
 
 Build:0.1a,1
     commit=a6077453161
diff --git a/metadata/io.github.powerinside.scrollsocket.txt b/metadata/io.github.powerinside.scrollsocket.txt
index ab2db5abfe..9975aa7986 100644
--- a/metadata/io.github.powerinside.scrollsocket.txt
+++ b/metadata/io.github.powerinside.scrollsocket.txt
@@ -2,8 +2,8 @@ Categories:Connectivity
 License:MIT
 Author Name:Mohammed Irfan
 Web Site:http://powerinside.github.io/ScrollSocket/
-Source Code:https://github.com/PowerInside/ScrollSocket
-Issue Tracker:https://github.com/PowerInside/ScrollSocket/issues
+Source Code:https://github.com/mo3rfan/ScrollSocket
+Issue Tracker:https://github.com/mo3rfan/ScrollSocket/issues
 Donate:http://powerinside.github.io/ScrollSocket/donate
 FlattrID:7e9ba74ef32f6581ca63260607917324
 Bitcoin:16E1hn96zg9h16VCrxSG6p7b72vyNh64ft
@@ -23,7 +23,7 @@ This is a fork of the much awesome [[at.bitfire.gfxtablet]] app.
 .
 
 Repo Type:git
-Repo:https://github.com/PowerInside/ScrollSocket
+Repo:https://github.com/mo3rfan/ScrollSocket
 
 Build:1.0,1
     commit=1.0
diff --git a/metadata/io.github.powerinside.syncplay.txt b/metadata/io.github.powerinside.syncplay.txt
index 474eeee032..a1234a1969 100644
--- a/metadata/io.github.powerinside.syncplay.txt
+++ b/metadata/io.github.powerinside.syncplay.txt
@@ -2,8 +2,8 @@ Categories:Connectivity
 License:Apache-2.0
 Author Name:Mohammed Irfan
 Web Site:
-Source Code:https://github.com/PowerInside/syncplayer
-Issue Tracker:https://github.com/PowerInside/syncplayer/issues
+Source Code:https://github.com/mo3rfan/syncplayer
+Issue Tracker:https://github.com/mo3rfan/syncplayer/issues
 Bitcoin:16E1hn96zg9h16VCrxSG6p7b72vyNh64ft
 Litecoin:LQ88aMidLv4bkgLZ8ExZPYtMDrFbkwJL97
 
@@ -17,7 +17,7 @@ and make sure your friends join the same server and room.
 .
 
 Repo Type:git
-Repo:https://github.com/PowerInside/syncplayer
+Repo:https://github.com/mo3rfan/syncplayer
 
 Build:1.6.2,16
     commit=1.6.2
diff --git a/metadata/org.shortcuts.txt b/metadata/org.shortcuts.txt
index 630129c6aa..0872c798f9 100644
--- a/metadata/org.shortcuts.txt
+++ b/metadata/org.shortcuts.txt
@@ -1,9 +1,9 @@
 Categories:System
 License:GPL-3.0-only
 Web Site:
-Source Code:https://github.com/SufficientlySecure/calendar-contacts-shortcuts
-Issue Tracker:https://github.com/SufficientlySecure/calendar-contacts-shortcuts/issues
-Changelog:https://github.com/SufficientlySecure/calendar-contacts-shortcuts/blob/HEAD/CHANGELOG
+Source Code:https://github.com/PrivacyApps/calendar-contacts-shortcuts
+Issue Tracker:https://github.com/PrivacyApps/calendar-contacts-shortcuts/issues
+Changelog:https://github.com/PrivacyApps/calendar-contacts-shortcuts/blob/HEAD/CHANGELOG
 
 Auto Name:Shortcuts for Calendar/Contacts
 Summary:Add shortcuts for new calendars and contacts
@@ -13,7 +13,7 @@ for a new calendar event or a new contact.
 .
 
 Repo Type:git
-Repo:https://github.com/SufficientlySecure/calendar-contacts-shortcuts
+Repo:https://github.com/PrivacyApps/calendar-contacts-shortcuts
 
 Build:1.1,2
     commit=258d09e804b162d9e04d5059087d42475bf04f69
diff --git a/metadata/tk.jordynsmediagroup.simpleirc.fdroid.txt b/metadata/tk.jordynsmediagroup.simpleirc.fdroid.txt
index eda6cb2ea3..cb7e3f2490 100644
--- a/metadata/tk.jordynsmediagroup.simpleirc.fdroid.txt
+++ b/metadata/tk.jordynsmediagroup.simpleirc.fdroid.txt
@@ -1,8 +1,8 @@
 Categories:Internet
 License:GPL-3.0-only
-Web Site:https://github.com/jcjordyn130/simpleirc/blob/HEAD/README.md
-Source Code:https://github.com/jcjordyn130/simpleirc
-Issue Tracker:https://github.com/jcjordyn130/simpleirc/issues
+Web Site:https://github.com/thelinuxgeekcommunity/simpleirc/blob/HEAD/README.md
+Source Code:https://github.com/thelinuxgeekcommunity/simpleirc
+Issue Tracker:https://github.com/thelinuxgeekcommunity/simpleirc/issues
 
 Auto Name:Simple IRC
 Summary:Connect to an IRC server
@@ -27,7 +27,7 @@ Supports the following features:
 .
 
 Repo Type:git
-Repo:https://github.com/jcjordyn130/simpleirc
+Repo:https://github.com/thelinuxgeekcommunity/simpleirc
 
 Build:1.3,13
     commit=48e15e2617a97a2fb3068735d853737588c506a7