diff --git a/metadata/com.digitalfishfun.openshift.txt b/metadata/com.digitalfishfun.openshift.txt
index 637d8445b9..25e7a8eb3a 100644
--- a/metadata/com.digitalfishfun.openshift.txt
+++ b/metadata/com.digitalfishfun.openshift.txt
@@ -1,8 +1,8 @@
 Categories:System
 License:GPL-3.0-only
 Web Site:
-Source Code:https://github.com/joonatoona/OpenShift
-Issue Tracker:https://github.com/joonatoona/OpenShift/issues
+Source Code:https://github.com/LibreShift/OpenShift
+Issue Tracker:https://github.com/LibreShift/OpenShift/issues
 
 Auto Name:LibreShift
 Summary:Adjust screen color values
@@ -16,7 +16,7 @@ reboots.
 Requires Root:yes
 
 Repo Type:git
-Repo:https://github.com/joonatoona/OpenShift
+Repo:https://github.com/LibreShift/OpenShift
 
 Build:1.0,1
     commit=v0.1-alpha
diff --git a/metadata/com.infonuascape.osrshelper.txt b/metadata/com.infonuascape.osrshelper.txt
index 7f03e3bccb..e331ad28f2 100644
--- a/metadata/com.infonuascape.osrshelper.txt
+++ b/metadata/com.infonuascape.osrshelper.txt
@@ -1,9 +1,9 @@
 AntiFeatures:NonFreeNet,UpstreamNonFree
 Categories:Games
 License:GPL-3.0-only
-Web Site:https://github.com/ldionmarcil/OSRSHelper/blob/HEAD/README.md
-Source Code:https://github.com/ldionmarcil/OSRSHelper
-Issue Tracker:https://github.com/ldionmarcil/OSRSHelper/issues
+Web Site:https://github.com/OSRSHelper/OSRSHelper/blob/HEAD/README.md
+Source Code:https://github.com/OSRSHelper/OSRSHelper
+Issue Tracker:https://github.com/OSRSHelper/OSRSHelper/issues
 
 Auto Name:OSRS Helper
 Summary:View your RuneScape stats
@@ -13,7 +13,7 @@ character.
 .
 
 Repo Type:git
-Repo:https://github.com/ldionmarcil/OSRSHelper
+Repo:https://github.com/OSRSHelper/OSRSHelper
 
 Build:1.1.1,3
     commit=7c8b3ba8f400e280e36fec17779a295e94a70a5d
diff --git a/metadata/me.guillaumin.android.osmtracker.txt b/metadata/me.guillaumin.android.osmtracker.txt
index 86ebe87944..4b3f85db34 100644
--- a/metadata/me.guillaumin.android.osmtracker.txt
+++ b/metadata/me.guillaumin.android.osmtracker.txt
@@ -1,9 +1,9 @@
 Categories:Navigation
 License:GPL-3.0-only
 Web Site:
-Source Code:https://github.com/nguillaumin/osmtracker-android
-Issue Tracker:https://github.com/nguillaumin/osmtracker-android/issues
-Changelog:https://github.com/nguillaumin/osmtracker-android/releases
+Source Code:https://github.com/labexp/osmtracker-android
+Issue Tracker:https://github.com/labexp/osmtracker-android/issues
+Changelog:https://github.com/labexp/osmtracker-android/releases
 
 Name:OSMTracker
 Auto Name:OSMTracker for Android™
@@ -17,7 +17,7 @@ track on top of an OpenStreetMap background.
 .
 
 Repo Type:git
-Repo:https://github.com/nguillaumin/osmtracker-android.git
+Repo:https://github.com/labexp/osmtracker-android.git
 
 Build:0.5.6,21
     commit=0.5.6
diff --git a/metadata/net.opendasharchive.openarchive.release.txt b/metadata/net.opendasharchive.openarchive.release.txt
index 7c6ffce674..59d9d68bc2 100644
--- a/metadata/net.opendasharchive.openarchive.release.txt
+++ b/metadata/net.opendasharchive.openarchive.release.txt
@@ -1,8 +1,8 @@
 Categories:Multimedia
 License:GPL-3.0-only
 Web Site:https://open-archive.net
-Source Code:https://github.com/OpenArchive/openarchive
-Issue Tracker:https://github.com/OpenArchive/openarchive/issues
+Source Code:https://github.com/OpenArchive/openarchive-android
+Issue Tracker:https://github.com/OpenArchive/openarchive-android/issues
 
 Auto Name:OpenArchive
 Summary:Organize and share media
@@ -14,7 +14,7 @@ interested in finding it and reusing it in the future.
 .
 
 Repo Type:git
-Repo:https://github.com/OpenArchive/openarchive
+Repo:https://github.com/OpenArchive/openarchive-android
 
 Build:0.0.16,16
     commit=0.0.16
@@ -36,5 +36,5 @@ but doesn't verify, so this is included via the normal process.
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.0.17-alpha-1
-Current Version Code:17
+Current Version:0.0.17-beta-8
+Current Version Code:1718
diff --git a/metadata/nu.firetech.android.pactrack.txt b/metadata/nu.firetech.android.pactrack.txt
index c14985cab9..0ec3a96af5 100644
--- a/metadata/nu.firetech.android.pactrack.txt
+++ b/metadata/nu.firetech.android.pactrack.txt
@@ -20,5 +20,5 @@ Build:1.3.1,1310
 
 Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.3.1
-Current Version Code:1310
+Current Version:2.6.0
+Current Version Code:2601
diff --git a/metadata/org.nv95.openmanga.txt b/metadata/org.nv95.openmanga.txt
index a15f823863..6cd02478d9 100644
--- a/metadata/org.nv95.openmanga.txt
+++ b/metadata/org.nv95.openmanga.txt
@@ -63,5 +63,5 @@ Build:4.2,1116
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags ^v[0-9.]+$
-Current Version:4.2
-Current Version Code:1116
+Current Version:4.3.1
+Current Version Code:1302
diff --git a/metadata/org.openbmap.unifiedNlp.txt b/metadata/org.openbmap.unifiedNlp.txt
index f435803f51..57bd082bbb 100644
--- a/metadata/org.openbmap.unifiedNlp.txt
+++ b/metadata/org.openbmap.unifiedNlp.txt
@@ -1,8 +1,8 @@
 Categories:Navigation
 License:AGPL-3.0-only
 Web Site:http://www.radiocells.org
-Source Code:https://github.com/wish7code/org.openbmap.unifiedNlpProvider
-Issue Tracker:https://github.com/wish7code/org.openbmap.unifiedNlpProvider/issues
+Source Code:https://github.com/openbmap/radiocells-nlp-android
+Issue Tracker:https://github.com/openbmap/radiocells-nlp-android/issues
 
 Name:OpenBmapNlpBackend
 Auto Name:org.openbmap.unifiedNlpProvider
@@ -17,7 +17,7 @@ database is already present.
 .
 
 Repo Type:git
-Repo:https://github.com/wish7code/org.openbmap.unifiedNlpProvider
+Repo:https://github.com/openbmap/radiocells-nlp-android
 
 Build:0.1.0,2
     commit=c984820080fafe7b703c1c8c87e8dc5c5ade6692
diff --git a/metadata/org.openobservatory.ooniprobe.txt b/metadata/org.openobservatory.ooniprobe.txt
index c9757a3ea9..f47d56f4dc 100644
--- a/metadata/org.openobservatory.ooniprobe.txt
+++ b/metadata/org.openobservatory.ooniprobe.txt
@@ -114,5 +114,5 @@ Binaries:https://github.com/TheTorProject/ooniprobe-android/releases/download/v%
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags .*-fdroid
-Current Version:1.3.1-fdroid.1
-Current Version Code:24
+Current Version:1.3.2
+Current Version Code:25
diff --git a/metadata/org.redcross.openmapkit.txt b/metadata/org.redcross.openmapkit.txt
index 515a32364b..b40d4004ea 100644
--- a/metadata/org.redcross.openmapkit.txt
+++ b/metadata/org.redcross.openmapkit.txt
@@ -1,8 +1,8 @@
 Categories:Navigation
 License:BSD-3-Clause
 Web Site:http://openmapkit.org/
-Source Code:https://github.com/AmericanRedCross/OpenMapKitAndroid
-Issue Tracker:https://github.com/AmericanRedCross/OpenMapKitAndroid/issues
+Source Code:https://github.com/posm/OpenMapKitAndroid
+Issue Tracker:https://github.com/posm/OpenMapKitAndroid/issues
 
 Auto Name:OpenMapKit
 Summary:Browse OpenStreetMap features to create and edit OSM tags
@@ -32,7 +32,7 @@ serves this need.
 .
 
 Repo Type:git
-Repo:https://github.com/AmericanRedCross/OpenMapKitAndroid
+Repo:https://github.com/posm/OpenMapKitAndroid
 
 Build:1.2,23
     commit=v1.2
diff --git a/metadata/org.schabi.nxbookmarks.owncloud.txt b/metadata/org.schabi.nxbookmarks.owncloud.txt
index 15619cf22a..198809c209 100644
--- a/metadata/org.schabi.nxbookmarks.owncloud.txt
+++ b/metadata/org.schabi.nxbookmarks.owncloud.txt
@@ -41,5 +41,5 @@ Update Check Mode doesn't work because we can't find the computed packageId.
 
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:1.2
-Current Version Code:3
+Current Version:1.5
+Current Version Code:6