diff --git a/media-libs/alsa-ucm-pinephone/metadata.xml b/media-libs/alsa-ucm-pinephone/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/media-libs/alsa-ucm-pinephone/metadata.xml
+++ b/media-libs/alsa-ucm-pinephone/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-dialup/atinout/metadata.xml b/net-dialup/atinout/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/net-dialup/atinout/metadata.xml
+++ b/net-dialup/atinout/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-im/whatsapp-for-linux/metadata.xml b/net-im/whatsapp-for-linux/metadata.xml
index 96d8fceed5..ad6f3aa383 100644
--- a/net-im/whatsapp-for-linux/metadata.xml
+++ b/net-im/whatsapp-for-linux/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">eneshecan/whatsapp-for-linux</remote-id>
 		<bugs-to>https://github.com/eneshecan/whatsapp-for-linux/issues</bugs-to>
diff --git a/net-misc/eg25-manager/metadata.xml b/net-misc/eg25-manager/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/net-misc/eg25-manager/metadata.xml
+++ b/net-misc/eg25-manager/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-voip/calls/metadata.xml b/net-voip/calls/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/net-voip/calls/metadata.xml
+++ b/net-voip/calls/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-plugins/purple-mm-sms/metadata.xml b/x11-plugins/purple-mm-sms/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/x11-plugins/purple-mm-sms/metadata.xml
+++ b/x11-plugins/purple-mm-sms/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>