diff --git a/acct-group/dnsdist/metadata.xml b/acct-group/dnsdist/metadata.xml
index e8de1c56b30ff..115e9d64a6695 100644
--- a/acct-group/dnsdist/metadata.xml
+++ b/acct-group/dnsdist/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nativemad@gentoo.org</email>
-		<name>Andreas Schuerch</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/acct-group/turnserver/metadata.xml b/acct-group/turnserver/metadata.xml
index e8de1c56b30ff..115e9d64a6695 100644
--- a/acct-group/turnserver/metadata.xml
+++ b/acct-group/turnserver/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nativemad@gentoo.org</email>
-		<name>Andreas Schuerch</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/acct-user/dnsdist/metadata.xml b/acct-user/dnsdist/metadata.xml
index e8de1c56b30ff..115e9d64a6695 100644
--- a/acct-user/dnsdist/metadata.xml
+++ b/acct-user/dnsdist/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nativemad@gentoo.org</email>
-		<name>Andreas Schuerch</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/acct-user/turnserver/metadata.xml b/acct-user/turnserver/metadata.xml
index e8de1c56b30ff..115e9d64a6695 100644
--- a/acct-user/turnserver/metadata.xml
+++ b/acct-user/turnserver/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nativemad@gentoo.org</email>
-		<name>Andreas Schuerch</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index 208d832c08569..97a6142b57279 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nativemad@gentoo.org</email>
-		<name>Andreas Schuerch</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		dnsdist is a highly DNS-, DoS- and abuse-aware loadbalancer. Its goal in life is to route traffic to the best server, delivering top performance to legitimate users while shunting or blocking abusive traffic.
 	</longdescription>
diff --git a/net-im/coturn/metadata.xml b/net-im/coturn/metadata.xml
index 37bda90badcaa..1801b91d9921f 100644
--- a/net-im/coturn/metadata.xml
+++ b/net-im/coturn/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>nativemad@gentoo.org</email>
-    <name>Andreas Schuerch</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">coturn/coturn</remote-id>
   </upstream>
diff --git a/net-libs/libtelnet/metadata.xml b/net-libs/libtelnet/metadata.xml
index 4ad42fec77ea5..d618b4c14a8eb 100644
--- a/net-libs/libtelnet/metadata.xml
+++ b/net-libs/libtelnet/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>nativemad@gentoo.org</email>
-    <name>Andreas Schuerch</name>
-  </maintainer>
   <maintainer type="person">
     <email>jsmolic@gentoo.org</email>
     <name>Jakov Smolić</name>
diff --git a/sys-fs/dislocker/metadata.xml b/sys-fs/dislocker/metadata.xml
index c12d7f89706a2..5b357b2c530d5 100644
--- a/sys-fs/dislocker/metadata.xml
+++ b/sys-fs/dislocker/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>nativemad@gentoo.org</email>
-    <name>Andreas Schuerch</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">Aorimn/dislocker</remote-id>
   </upstream>