diff --git a/app-misc/fetsh/metadata.xml b/app-misc/fetsh/metadata.xml
index ec0f1753cd..e5029e2264 100644
--- a/app-misc/fetsh/metadata.xml
+++ b/app-misc/fetsh/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>coppens.matthias.abc@gmail.com</email>
-		<name>Matthias Coppens</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">6gk/fet.sh</remote-id>
 		<bugs-to>https://github.com/6gk/fet.sh/issues</bugs-to>
diff --git a/app-misc/navi/metadata.xml b/app-misc/navi/metadata.xml
index 4f10405368..9cf2cb78be 100644
--- a/app-misc/navi/metadata.xml
+++ b/app-misc/navi/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>coppens.matthias.abc@gmail.com</email>
-		<name>Matthias Coppens</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/denisidoro/navi/issues</bugs-to>
 		<doc>https://github.com/denisidoro/navi#usage</doc>
diff --git a/app-misc/ufetch/metadata.xml b/app-misc/ufetch/metadata.xml
index f0581647e2..f91956970b 100644
--- a/app-misc/ufetch/metadata.xml
+++ b/app-misc/ufetch/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>coppens.matthias.abc@gmail.com</email>
-        <name>Matthias Coppens</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <upstream>
         <bugs-to>https://gitlab.com/jschx/ufetch/-/issues</bugs-to>
         <remote-id type="gitlab">jschx/ufetch</remote-id>
diff --git a/dev-python/ascim/metadata.xml b/dev-python/ascim/metadata.xml
index f23bdaea21..870a9ad63c 100644
--- a/dev-python/ascim/metadata.xml
+++ b/dev-python/ascim/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>coppens.matthias.abc@gmail.com</email>
-        <name>Matthias Coppens</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <upstream>
         <doc>https://github.com/fakefred/ascim#usage</doc>
         <bugs-to>https://github.com/fakefred/ascim/issues</bugs-to>
diff --git a/dev-python/colored/metadata.xml b/dev-python/colored/metadata.xml
index 25ea1712a2..a49e676e87 100644
--- a/dev-python/colored/metadata.xml
+++ b/dev-python/colored/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>coppens.matthias.abc@gmail.com</email>
-        <name>Matthias Coppens</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <longdescription lang="en">
         Very simple Python library for color and formatting in terminal.
         Collection of color codes and names for 256 color terminal setups.
diff --git a/dev-python/pyfiglet/metadata.xml b/dev-python/pyfiglet/metadata.xml
index 4a5167c469..a7da40097b 100644
--- a/dev-python/pyfiglet/metadata.xml
+++ b/dev-python/pyfiglet/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>coppens.matthias.abc@gmail.com</email>
-        <name>Matthias Coppens</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <upstream>
         <remote-id type="github">pwaller/pyfiglet</remote-id>
         <remote-id type="pypi">pyfiglet</remote-id>
diff --git a/gui-apps/mpvpaper/metadata.xml b/gui-apps/mpvpaper/metadata.xml
index 0666680bf4..241aed893a 100644
--- a/gui-apps/mpvpaper/metadata.xml
+++ b/gui-apps/mpvpaper/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">
-		<name>Matthias Coppens</name>
-		<email>coppens.matthias.abc@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		MPVPaper is a wallpaper program for wlroots based wayland compositors,
 		such as sway. That allows you to play videos with mpv as your wallpaper.
diff --git a/gui-apps/nwg-launchers/metadata.xml b/gui-apps/nwg-launchers/metadata.xml
index 5d0f670068..ccfe9e4c86 100644
--- a/gui-apps/nwg-launchers/metadata.xml
+++ b/gui-apps/nwg-launchers/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>coppens.matthias.abc@gmail.com</email>
-        <name>Matthias Coppens</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <use>
         <flag name="bar">Installs nwgbar,
             a horizontal or vertical button bar.</flag>
diff --git a/gui-apps/swaylock-effects/metadata.xml b/gui-apps/swaylock-effects/metadata.xml
index 43405d5124..e1308c2654 100644
--- a/gui-apps/swaylock-effects/metadata.xml
+++ b/gui-apps/swaylock-effects/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">
-        <name>Matthias Coppens</name>
-        <email>coppens.matthias.abc@gmail.com</email>
-    </maintainer>
+    <!-- maintainer-needed -->
     <use>
         <flag name="fish-completion">Enable fish completion support</flag>
         <flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag>
diff --git a/gui-apps/wdisplays/metadata.xml b/gui-apps/wdisplays/metadata.xml
index e762524294..1e1ae32f95 100644
--- a/gui-apps/wdisplays/metadata.xml
+++ b/gui-apps/wdisplays/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">
-        <name>Matthias Coppens</name>
-        <email>coppens.matthias.abc@gmail.com</email>
-    </maintainer>
+    <!-- maintainer-needed -->
     <upstream>
         <bugs-to>https://github.com/artizirk/wdisplays/issues</bugs-to>
         <remote-id type="github">artizirk/wdisplays</remote-id>
diff --git a/gui-wm/cage/metadata.xml b/gui-wm/cage/metadata.xml
index b426d7f460..06d1d00e18 100644
--- a/gui-wm/cage/metadata.xml
+++ b/gui-wm/cage/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>coppens.matthias.abc@gmail.com</email>
-        <name>Matthias Coppens</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <use>
         <flag name="X">Enable support for X11 applications (XWayland)</flag>
     </use>
diff --git a/media-sound/pulseaudio-virtualmic/metadata.xml b/media-sound/pulseaudio-virtualmic/metadata.xml
index 771f8e2194..1d02c191c6 100644
--- a/media-sound/pulseaudio-virtualmic/metadata.xml
+++ b/media-sound/pulseaudio-virtualmic/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">
-        <name>Matthias Coppens</name>
-        <email>coppens.matthias.abc@gmail.com</email>
-    </maintainer>
+    <!-- maintainer-needed -->
     <upstream>
         <remote-id type="github">MatthiasCoppens/pulseaudio-virtualmic</remote-id>
     </upstream>
diff --git a/media-video/wlrobs/metadata.xml b/media-video/wlrobs/metadata.xml
index 236a837772..0fcce831d5 100644
--- a/media-video/wlrobs/metadata.xml
+++ b/media-video/wlrobs/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">
-        <name>Matthias Coppens</name>
-        <email>coppens.matthias.abc@gmail.com</email>
-    </maintainer>
+    <!-- maintainer-needed -->
     <upstream>
         <bugs-to>https://todo.sr.ht/~scoopta/wlrobs</bugs-to>
     </upstream>
diff --git a/sys-fs/diskonaut/metadata.xml b/sys-fs/diskonaut/metadata.xml
index 73429990b5..6a88fdd7ed 100644
--- a/sys-fs/diskonaut/metadata.xml
+++ b/sys-fs/diskonaut/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>coppens.matthias.abc@gmail.com</email>
-        <name>Matthias Coppens</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <longdescription lang="en">
         Given a path on your hard-drive (which could also be the root path,
         eg. /). diskonaut scans it and indexes its metadata to memory so that