diff --git a/kde-apps/kate-addons/metadata.xml b/kde-apps/kate-addons/metadata.xml
index 51892625c09d9..8bb96938cf37c 100644
--- a/kde-apps/kate-addons/metadata.xml
+++ b/kde-apps/kate-addons/metadata.xml
@@ -6,7 +6,9 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kate</bugs-to>
+		<remote-id type="cpe">cpe:/a:kde:kate</remote-id>
+		<remote-id type="kde-invent">utilities/kate</remote-id>
 	</upstream>
 	<use>
 		<flag name="filebrowser">Enable File System browser tool view</flag>
diff --git a/kde-apps/kate-lib/metadata.xml b/kde-apps/kate-lib/metadata.xml
index 6edd09df605f6..1460384640f9f 100644
--- a/kde-apps/kate-lib/metadata.xml
+++ b/kde-apps/kate-lib/metadata.xml
@@ -6,7 +6,9 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kate</bugs-to>
+		<remote-id type="cpe">cpe:/a:kde:kate</remote-id>
+		<remote-id type="kde-invent">utilities/kate</remote-id>
 	</upstream>
 	<use>
 		<flag name="activities">Enable Plasma Activities support via <pkg>kde-plasma/plasma-activities</pkg></flag>
diff --git a/kde-apps/kate/metadata.xml b/kde-apps/kate/metadata.xml
index 0dd08b0494599..5cdb7511b6791 100644
--- a/kde-apps/kate/metadata.xml
+++ b/kde-apps/kate/metadata.xml
@@ -6,7 +6,8 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kate</bugs-to>
 		<remote-id type="cpe">cpe:/a:kde:kate</remote-id>
+		<remote-id type="kde-invent">utilities/kate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-apps/kwrite/metadata.xml b/kde-apps/kwrite/metadata.xml
index d925f24397588..5cdb7511b6791 100644
--- a/kde-apps/kwrite/metadata.xml
+++ b/kde-apps/kwrite/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kate</bugs-to>
+		<remote-id type="cpe">cpe:/a:kde:kate</remote-id>
+		<remote-id type="kde-invent">utilities/kate</remote-id>
 	</upstream>
 </pkgmetadata>