diff --git a/acct-group/gvm/metadata.xml b/acct-group/gvm/metadata.xml
index 4004f5da1467d..fcf1cd64f6804 100644
--- a/acct-group/gvm/metadata.xml
+++ b/acct-group/gvm/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-		</maintainer>
-</pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/acct-user/gvm/metadata.xml b/acct-user/gvm/metadata.xml
index de76f9c0db930..034da9f86f9e8 100644
--- a/acct-user/gvm/metadata.xml
+++ b/acct-user/gvm/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person" proxied="yes">
-                <email>jonas.licht@gmail.com</email>
-                <name>Jonas Licht</name>
-        </maintainer>
-        <maintainer type="project" proxied="proxy">
-                <email>proxy-maint@gentoo.org</email>
-                <name>Proxy Maintainers</name>
-        </maintainer>
-</pkgmetadata>
+        <!-- maintainer-needed -->
+        </pkgmetadata>
diff --git a/dev-libs/cgreen/metadata.xml b/dev-libs/cgreen/metadata.xml
index 57fde7f7698ba..096360b6ba9f9 100644
--- a/dev-libs/cgreen/metadata.xml
+++ b/dev-libs/cgreen/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">cgreen-devs/cgreen</remote-id>
 	</upstream>
diff --git a/dev-tex/biber/metadata.xml b/dev-tex/biber/metadata.xml
index 38b762a0360bb..7cecd3f90a966 100644
--- a/dev-tex/biber/metadata.xml
+++ b/dev-tex/biber/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<name>Jonas Licht</name>
-		<email>jonas.licht@gmail.com</email>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>tex@gentoo.org</email>
 		<name>Gentoo TeX Project</name>
diff --git a/gnome-extra/nautilus-dropbox/metadata.xml b/gnome-extra/nautilus-dropbox/metadata.xml
index 6c516c8f69401..77336d88e5362 100644
--- a/gnome-extra/nautilus-dropbox/metadata.xml
+++ b/gnome-extra/nautilus-dropbox/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<name>Jonas Licht</name>
-		<email>jonas.licht@gmail.com</email>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">dropbox/nautilus-dropbox</remote-id>
 	</upstream>
diff --git a/net-analyzer/gsa/metadata.xml b/net-analyzer/gsa/metadata.xml
index 6fb56eca51551..aa8e4edf754e4 100644
--- a/net-analyzer/gsa/metadata.xml
+++ b/net-analyzer/gsa/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/gsad/metadata.xml b/net-analyzer/gsad/metadata.xml
index 27bf47cfefc0f..43f84bcab7477 100644
--- a/net-analyzer/gsad/metadata.xml
+++ b/net-analyzer/gsad/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/gvm-libs/metadata.xml b/net-analyzer/gvm-libs/metadata.xml
index df3bcf4ee54f5..b7136456d4392 100644
--- a/net-analyzer/gvm-libs/metadata.xml
+++ b/net-analyzer/gvm-libs/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/gvm-tools/metadata.xml b/net-analyzer/gvm-tools/metadata.xml
index 49aa4756bce91..9dac8a2bb335d 100644
--- a/net-analyzer/gvm-tools/metadata.xml
+++ b/net-analyzer/gvm-tools/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/gvm/metadata.xml b/net-analyzer/gvm/metadata.xml
index 588dd28fa08c7..9a9ba3cac03dc 100644
--- a/net-analyzer/gvm/metadata.xml
+++ b/net-analyzer/gvm/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml
index 362c0017dc237..c20efeb6e5752 100644
--- a/net-analyzer/gvmd/metadata.xml
+++ b/net-analyzer/gvmd/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml
index 8b98cc0ee1110..177d061aa8be0 100644
--- a/net-analyzer/openvas-scanner/metadata.xml
+++ b/net-analyzer/openvas-scanner/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/ospd-openvas/metadata.xml b/net-analyzer/ospd-openvas/metadata.xml
index 18eb90f3e699f..cfeef6b2af20f 100644
--- a/net-analyzer/ospd-openvas/metadata.xml
+++ b/net-analyzer/ospd-openvas/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/python-gvm/metadata.xml b/net-analyzer/python-gvm/metadata.xml
index fc9cf3041b5d8..d040955023c6e 100644
--- a/net-analyzer/python-gvm/metadata.xml
+++ b/net-analyzer/python-gvm/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/sys-apps/thunderbolt-software-user-space/metadata.xml b/sys-apps/thunderbolt-software-user-space/metadata.xml
index 194d9e70626bd..3903bd5d2e95d 100644
--- a/sys-apps/thunderbolt-software-user-space/metadata.xml
+++ b/sys-apps/thunderbolt-software-user-space/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<name>Jonas Licht</name>
-		<email>jonas.licht@gmail.com</email>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Installs the tools tbtacl and tbtadm for Thunderbolt device approval, handling the ACL and more.
 		Also install udev rules to mange acls.