diff --git a/app-admin/systemdgenie/metadata.xml b/app-admin/systemdgenie/metadata.xml
index 274bd0f534a..5066380bcf2 100644
--- a/app-admin/systemdgenie/metadata.xml
+++ b/app-admin/systemdgenie/metadata.xml
@@ -13,5 +13,6 @@
 			<email>rthomsen6@gmail.com</email>
 			<name>Ragnar Thomsen</name>
 		</maintainer>
+		<remote-id type="kde-invent">system/systemdgenie</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/kookbook/metadata.xml b/app-misc/kookbook/metadata.xml
index d925f243975..471f9f6d692 100644
--- a/app-misc/kookbook/metadata.xml
+++ b/app-misc/kookbook/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">utilities/kookbook</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/chmk/metadata.xml b/app-text/chmk/metadata.xml
index d925f243975..d865d1e1608 100644
--- a/app-text/chmk/metadata.xml
+++ b/app-text/chmk/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">aacid/chmk</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/kopeninghours/metadata.xml b/dev-libs/kopeninghours/metadata.xml
index d925f243975..4dee22b2e44 100644
--- a/dev-libs/kopeninghours/metadata.xml
+++ b/dev-libs/kopeninghours/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">libraries/kopeninghours</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/kosmindoormap/metadata.xml b/dev-libs/kosmindoormap/metadata.xml
index d5abc837abc..51bb95c924f 100644
--- a/dev-libs/kosmindoormap/metadata.xml
+++ b/dev-libs/kosmindoormap/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">libraries/kosmindoormap</remote-id>
 	</upstream>
 	<use>
 		<flag name="openinghours">Enable support for highlighting currently open amenities/shops/etc.</flag>
diff --git a/dev-libs/kpeoplevcard/metadata.xml b/dev-libs/kpeoplevcard/metadata.xml
index d925f243975..21c5734b1c4 100644
--- a/dev-libs/kpeoplevcard/metadata.xml
+++ b/dev-libs/kpeoplevcard/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">pim/kpeoplevcard</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/plasma-wayland-protocols/metadata.xml b/dev-libs/plasma-wayland-protocols/metadata.xml
index d925f243975..d060b5f3ec6 100644
--- a/dev-libs/plasma-wayland-protocols/metadata.xml
+++ b/dev-libs/plasma-wayland-protocols/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">libraries/plasma-wayland-protocols</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-board/atlantik/metadata.xml b/games-board/atlantik/metadata.xml
index d925f243975..a61f24e4b96 100644
--- a/games-board/atlantik/metadata.xml
+++ b/games-board/atlantik/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">games/atlantik</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-mud/kmuddy/metadata.xml b/games-mud/kmuddy/metadata.xml
index f913ec1be35..371a8f7ff07 100644
--- a/games-mud/kmuddy/metadata.xml
+++ b/games-mud/kmuddy/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">games/kmuddy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/gui-apps/liquidshell/metadata.xml b/gui-apps/liquidshell/metadata.xml
index d925f243975..7343caf92df 100644
--- a/gui-apps/liquidshell/metadata.xml
+++ b/gui-apps/liquidshell/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">system/liquidshell</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-apps/akonadi-search/metadata.xml b/kde-apps/akonadi-search/metadata.xml
index d925f243975..ca7bf258a46 100644
--- a/kde-apps/akonadi-search/metadata.xml
+++ b/kde-apps/akonadi-search/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">pim/akonadi-search</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-misc/akonadiclient/metadata.xml b/kde-misc/akonadiclient/metadata.xml
index d925f243975..3b57bfc1a0b 100644
--- a/kde-misc/akonadiclient/metadata.xml
+++ b/kde-misc/akonadiclient/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">pim/akonadiclient</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-misc/basket/metadata.xml b/kde-misc/basket/metadata.xml
index d925f243975..d7b2c0aec42 100644
--- a/kde-misc/basket/metadata.xml
+++ b/kde-misc/basket/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">utilities/basket</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-misc/kio-stash/metadata.xml b/kde-misc/kio-stash/metadata.xml
index d925f243975..21702b0130f 100644
--- a/kde-misc/kio-stash/metadata.xml
+++ b/kde-misc/kio-stash/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">utilities/kio-stash</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-misc/polkit-kde-kcmodules/metadata.xml b/kde-misc/polkit-kde-kcmodules/metadata.xml
index d925f243975..06f45109705 100644
--- a/kde-misc/polkit-kde-kcmodules/metadata.xml
+++ b/kde-misc/polkit-kde-kcmodules/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">system/polkit-kde-kcmodules-1</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-plasma/breeze-gtk/metadata.xml b/kde-plasma/breeze-gtk/metadata.xml
index d925f243975..543f816c463 100644
--- a/kde-plasma/breeze-gtk/metadata.xml
+++ b/kde-plasma/breeze-gtk/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/breeze-gtk</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-plasma/kde-cli-tools/metadata.xml b/kde-plasma/kde-cli-tools/metadata.xml
index c20b86d4f7a..90af160c0c8 100644
--- a/kde-plasma/kde-cli-tools/metadata.xml
+++ b/kde-plasma/kde-cli-tools/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/kde-cli-tools</remote-id>
 	</upstream>
 	<use>
 		<flag name="kdesu">Build graphical frontend for <pkg>kde-frameworks/kdesu</pkg></flag>
diff --git a/kde-plasma/kmenuedit/metadata.xml b/kde-plasma/kmenuedit/metadata.xml
index d925f243975..7fe5ace1f98 100644
--- a/kde-plasma/kmenuedit/metadata.xml
+++ b/kde-plasma/kmenuedit/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/kmenuedit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-plasma/kscreen/metadata.xml b/kde-plasma/kscreen/metadata.xml
index d925f243975..307cc9b5952 100644
--- a/kde-plasma/kscreen/metadata.xml
+++ b/kde-plasma/kscreen/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/kscreen</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-plasma/milou/metadata.xml b/kde-plasma/milou/metadata.xml
index d925f243975..bd104055766 100644
--- a/kde-plasma/milou/metadata.xml
+++ b/kde-plasma/milou/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/milou</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-plasma/oxygen-sounds/metadata.xml b/kde-plasma/oxygen-sounds/metadata.xml
index d925f243975..0a584161d50 100644
--- a/kde-plasma/oxygen-sounds/metadata.xml
+++ b/kde-plasma/oxygen-sounds/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/oxygen-sounds</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-plasma/sddm-kcm/metadata.xml b/kde-plasma/sddm-kcm/metadata.xml
index d925f243975..ef73ee478dd 100644
--- a/kde-plasma/sddm-kcm/metadata.xml
+++ b/kde-plasma/sddm-kcm/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/sddm-kcm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-plasma/xembed-sni-proxy/metadata.xml b/kde-plasma/xembed-sni-proxy/metadata.xml
index d925f243975..7a4a42fc5fa 100644
--- a/kde-plasma/xembed-sni-proxy/metadata.xml
+++ b/kde-plasma/xembed-sni-proxy/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/plasma-workspace</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/kquickimageeditor/metadata.xml b/media-libs/kquickimageeditor/metadata.xml
index d925f243975..0331b40d8c5 100644
--- a/media-libs/kquickimageeditor/metadata.xml
+++ b/media-libs/kquickimageeditor/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">libraries/kquickimageeditor</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/ksanecore/metadata.xml b/media-libs/ksanecore/metadata.xml
index 8641e5bdd39..2016639ee2e 100644
--- a/media-libs/ksanecore/metadata.xml
+++ b/media-libs/ksanecore/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="kde-invent">libraries/ksanecore</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/pulseaudio-qt/metadata.xml b/media-libs/pulseaudio-qt/metadata.xml
index d925f243975..20786646909 100644
--- a/media-libs/pulseaudio-qt/metadata.xml
+++ b/media-libs/pulseaudio-qt/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">libraries/pulseaudio-qt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libmediawiki/metadata.xml b/net-libs/libmediawiki/metadata.xml
index d925f243975..94506f58964 100644
--- a/net-libs/libmediawiki/metadata.xml
+++ b/net-libs/libmediawiki/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">libraries/libmediawiki</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libtmdbqt/metadata.xml b/net-libs/libtmdbqt/metadata.xml
index d925f243975..7937a969191 100644
--- a/net-libs/libtmdbqt/metadata.xml
+++ b/net-libs/libtmdbqt/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">libraries/libtmdbqt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/telepathy-logger-qt/metadata.xml b/net-libs/telepathy-logger-qt/metadata.xml
index d925f243975..d16002b1e40 100644
--- a/net-libs/telepathy-logger-qt/metadata.xml
+++ b/net-libs/telepathy-logger-qt/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">network/telepathy-logger-qt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/samba-mounter/metadata.xml b/net-misc/samba-mounter/metadata.xml
index d925f243975..7af6304554a 100644
--- a/net-misc/samba-mounter/metadata.xml
+++ b/net-misc/samba-mounter/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">system/samba-mounter</remote-id>
 	</upstream>
 </pkgmetadata>