diff --git a/dev-libs/feedbackd/metadata.xml b/dev-libs/feedbackd/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/dev-libs/feedbackd/metadata.xml
+++ b/dev-libs/feedbackd/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/dev-libs/olm/metadata.xml b/dev-libs/olm/metadata.xml
index 4db77a8b93..001398bcde 100644
--- a/dev-libs/olm/metadata.xml
+++ b/dev-libs/olm/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gentoo@tastytea.de</email>
 		<name>Ronny (tastytea) Gutbrod</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
 	<longdescription lang="en">
 		An implementation of the Double Ratchet cryptographic ratchet written in
 		C and C++11 and exposed as a C API.
diff --git a/dev-python/fchroot/metadata.xml b/dev-python/fchroot/metadata.xml
index 6756bd5d70..5dd7771521 100644
--- a/dev-python/fchroot/metadata.xml
+++ b/dev-python/fchroot/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" proxied="yes">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">fchroot</remote-id>
 	</upstream>
diff --git a/gnome-extra/iio-sensor-proxy/metadata.xml b/gnome-extra/iio-sensor-proxy/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/gnome-extra/iio-sensor-proxy/metadata.xml
+++ b/gnome-extra/iio-sensor-proxy/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/gnome-extra/portfolio/metadata.xml b/gnome-extra/portfolio/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/gnome-extra/portfolio/metadata.xml
+++ b/gnome-extra/portfolio/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/media-sound/callaudiod/metadata.xml b/media-sound/callaudiod/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/media-sound/callaudiod/metadata.xml
+++ b/media-sound/callaudiod/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/sys-power/gtherm/metadata.xml b/sys-power/gtherm/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/sys-power/gtherm/metadata.xml
+++ b/sys-power/gtherm/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-misc/squeekboard/metadata.xml b/x11-misc/squeekboard/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/x11-misc/squeekboard/metadata.xml
+++ b/x11-misc/squeekboard/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-themes/sound-theme-librem5/metadata.xml b/x11-themes/sound-theme-librem5/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/x11-themes/sound-theme-librem5/metadata.xml
+++ b/x11-themes/sound-theme-librem5/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>