diff --git a/acct-group/monero/metadata.xml b/acct-group/monero/metadata.xml
index abf827a81c..115e9d64a6 100644
--- a/acct-group/monero/metadata.xml
+++ b/acct-group/monero/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>telans@posteo.de</email>
-    <name>James Beddek</name>
-  </maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/acct-user/monero/metadata.xml b/acct-user/monero/metadata.xml
index abf827a81c..115e9d64a6 100644
--- a/acct-user/monero/metadata.xml
+++ b/acct-user/monero/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>telans@posteo.de</email>
-    <name>James Beddek</name>
-  </maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-admin/antidot/metadata.xml b/app-admin/antidot/metadata.xml
index f53fc6f66c..c03cf365c4 100644
--- a/app-admin/antidot/metadata.xml
+++ b/app-admin/antidot/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">doron-cohen/antidot</remote-id>
 	</upstream>
diff --git a/app-misc/glow/metadata.xml b/app-misc/glow/metadata.xml
index 46ee85bfd8..46e1f83d77 100644
--- a/app-misc/glow/metadata.xml
+++ b/app-misc/glow/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">charmbracelet/glow</remote-id>
 	</upstream>
diff --git a/app-text/OCRmyPDF/metadata.xml b/app-text/OCRmyPDF/metadata.xml
index c1f48ab506..244554a0a7 100644
--- a/app-text/OCRmyPDF/metadata.xml
+++ b/app-text/OCRmyPDF/metadata.xml
@@ -5,10 +5,6 @@
 		<email>alarig@swordarmor.fr</email>
 		<name>Alarig Le Lay</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">ocrmypdf/OCRmyPDF</remote-id>
 	</upstream>
diff --git a/dev-libs/randomx/metadata.xml b/dev-libs/randomx/metadata.xml
index c9a81f731f..a234dcc638 100644
--- a/dev-libs/randomx/metadata.xml
+++ b/dev-libs/randomx/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>telans@posteo.de</email>
-    <name>James Beddek</name>
-  </maintainer>
+	<!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">tevador/RandomX</remote-id>
   </upstream>
diff --git a/dev-libs/supercop/metadata.xml b/dev-libs/supercop/metadata.xml
index 67f1618efe..a0ee64e881 100644
--- a/dev-libs/supercop/metadata.xml
+++ b/dev-libs/supercop/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>telans@posteo.de</email>
-    <name>James Beddek</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">monero-project/supercop</remote-id>
   </upstream>
diff --git a/dev-python/dataclasses_json/metadata.xml b/dev-python/dataclasses_json/metadata.xml
index 9e38e54f38..851a5b4c01 100644
--- a/dev-python/dataclasses_json/metadata.xml
+++ b/dev-python/dataclasses_json/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">lidatong/dataclasses-json</remote-id>
 	</upstream>
diff --git a/dev-python/hypothesmith/metadata.xml b/dev-python/hypothesmith/metadata.xml
index d532b57ab7..c9f2d9ef18 100644
--- a/dev-python/hypothesmith/metadata.xml
+++ b/dev-python/hypothesmith/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Zac-HD/hypothesmith</remote-id>
 		<remote-id type="pypi">hypothesmith</remote-id>
diff --git a/dev-python/libcst/metadata.xml b/dev-python/libcst/metadata.xml
index 2be849ad08..d1bf9ed9cb 100644
--- a/dev-python/libcst/metadata.xml
+++ b/dev-python/libcst/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Instagram/LibCST</remote-id>
 	</upstream>
diff --git a/dev-python/marshmallow_enum/metadata.xml b/dev-python/marshmallow_enum/metadata.xml
index 38b71c201c..2cdeb2f108 100644
--- a/dev-python/marshmallow_enum/metadata.xml
+++ b/dev-python/marshmallow_enum/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">justanr/marshmallow_enum</remote-id>
 	</upstream>
diff --git a/dev-python/moreorless/metadata.xml b/dev-python/moreorless/metadata.xml
index 3bbbe6bf63..452b3d29d4 100644
--- a/dev-python/moreorless/metadata.xml
+++ b/dev-python/moreorless/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">thatch/moreorless</remote-id>
 		<remote-id type="pypi">moreorless</remote-id>
diff --git a/dev-python/pykeepass/metadata.xml b/dev-python/pykeepass/metadata.xml
index a6347722cb..6389af9361 100644
--- a/dev-python/pykeepass/metadata.xml
+++ b/dev-python/pykeepass/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>telans@posteo.de</email>
-        <name>James Beddek</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <upstream>
         <remote-id type="github">libkeepass/pykeepass</remote-id>
     </upstream>
diff --git a/dev-python/python-skywater-pdk/metadata.xml b/dev-python/python-skywater-pdk/metadata.xml
index e142b76491..44db83647e 100644
--- a/dev-python/python-skywater-pdk/metadata.xml
+++ b/dev-python/python-skywater-pdk/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">google/skywater-pdk</remote-id>
 	</upstream>
diff --git a/dev-python/stdlibs/metadata.xml b/dev-python/stdlibs/metadata.xml
index fd5cf7410c..b1ca0e69d6 100644
--- a/dev-python/stdlibs/metadata.xml
+++ b/dev-python/stdlibs/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">omnilib/stdlibs</remote-id>
 		<remote-id type="pypi">stdlibs</remote-id>
diff --git a/dev-python/trailrunner/metadata.xml b/dev-python/trailrunner/metadata.xml
index e71c13f299..da850667c3 100644
--- a/dev-python/trailrunner/metadata.xml
+++ b/dev-python/trailrunner/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">omnilib/trailrunner</remote-id>
 		<remote-id type="pypi">trailrunner</remote-id>
diff --git a/dev-python/typing_inspect/metadata.xml b/dev-python/typing_inspect/metadata.xml
index 92c6009d30..33a8fb3b88 100644
--- a/dev-python/typing_inspect/metadata.xml
+++ b/dev-python/typing_inspect/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ilevkivskyi/typing_inspect</remote-id>
 		<remote-id type="pypi">typing_inspect</remote-id>
diff --git a/dev-python/volatile/metadata.xml b/dev-python/volatile/metadata.xml
index 70843372f2..dc654fd20f 100644
--- a/dev-python/volatile/metadata.xml
+++ b/dev-python/volatile/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mbr/volatile</remote-id>
 	</upstream>
diff --git a/games-util/samrewritten/metadata.xml b/games-util/samrewritten/metadata.xml
index 235fad871a..8be12dc32f 100644
--- a/games-util/samrewritten/metadata.xml
+++ b/games-util/samrewritten/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>telans@posteo.de</email>
-    <name>James Beddek</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="zenity">Support for dialog display messages</flag>
   </use>
diff --git a/media-libs/svt-vp9/metadata.xml b/media-libs/svt-vp9/metadata.xml
index ef262f1590..ea0d174b93 100644
--- a/media-libs/svt-vp9/metadata.xml
+++ b/media-libs/svt-vp9/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>telans@posteo.de</email>
-        <name>James Beddek</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <upstream>
         <remote-id type="github">OpenVisualCloud/SVT-VP9</remote-id>
     </upstream>
diff --git a/media-video/tartube/metadata.xml b/media-video/tartube/metadata.xml
index 374ebbc57d..40c29f9f64 100644
--- a/media-video/tartube/metadata.xml
+++ b/media-video/tartube/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>telans@posteo.de</email>
-        <name>James Beddek</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <use>
         <flag name="atomicparsley">Use AtomicParsley for embedding thumbnails in audio files</flag>
     </use>
diff --git a/net-p2p/monero/metadata.xml b/net-p2p/monero/metadata.xml
index 66e5b44f1c..29d5abe636 100644
--- a/net-p2p/monero/metadata.xml
+++ b/net-p2p/monero/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>telans@posteo.de</email>
-    <name>James Beddek</name>
-  </maintainer>
   <maintainer type="person">
     <email>efe.izbudak@metu.edu.tr</email>
     <name>Efe İzbudak</name>
diff --git a/sci-electronics/open_pdks/metadata.xml b/sci-electronics/open_pdks/metadata.xml
index c7c4e3eb66..aae9470fae 100644
--- a/sci-electronics/open_pdks/metadata.xml
+++ b/sci-electronics/open_pdks/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="sky130">Build the Skywater 130nm PDK.</flag>
 	</use>
diff --git a/sci-electronics/skywater-pdk/metadata.xml b/sci-electronics/skywater-pdk/metadata.xml
index e142b76491..44db83647e 100644
--- a/sci-electronics/skywater-pdk/metadata.xml
+++ b/sci-electronics/skywater-pdk/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">google/skywater-pdk</remote-id>
 	</upstream>
diff --git a/sci-electronics/svls/metadata.xml b/sci-electronics/svls/metadata.xml
index 684e6e5ddc..5d53494125 100644
--- a/sci-electronics/svls/metadata.xml
+++ b/sci-electronics/svls/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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">dalance/svls</remote-id>
 	</upstream>