diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml
index 7d12d7b1b4147..37b4891258880 100644
--- a/app-text/calibre/metadata.xml
+++ b/app-text/calibre/metadata.xml
@@ -4,8 +4,8 @@
   <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
-  <maintainer type="person" proxied="yes">
-    <email>eschwartz93@gmail.com</email>
+  <maintainer type="person">
+    <email>eschwartz@gentoo.org</email>
     <name>Eli Schwartz</name>
   </maintainer>
   <upstream>
diff --git a/dev-build/meson/metadata.xml b/dev-build/meson/metadata.xml
index f4b485f0bec24..0bea8119a5b7a 100644
--- a/dev-build/meson/metadata.xml
+++ b/dev-build/meson/metadata.xml
@@ -4,8 +4,8 @@
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>eschwartz93@gmail.com</email>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
 		<name>Eli Schwartz</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-lang/rapydscript-ng/metadata.xml b/dev-lang/rapydscript-ng/metadata.xml
index ff2fd6660875c..d1afa03b2a7de 100644
--- a/dev-lang/rapydscript-ng/metadata.xml
+++ b/dev-lang/rapydscript-ng/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>eschwartz93@gmail.com</email>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
 		<name>Eli Schwartz</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">kovidgoyal/rapydscript-ng</remote-id>
 	</upstream>
diff --git a/dev-libs/mathjax/metadata.xml b/dev-libs/mathjax/metadata.xml
index de8e9f370f4bb..d816f6fd3178b 100644
--- a/dev-libs/mathjax/metadata.xml
+++ b/dev-libs/mathjax/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>eschwartz93@gmail.com</email>
+  <maintainer type="person">
+    <email>eschwartz@gentoo.org</email>
     <name>Eli Schwartz</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <stabilize-allarches/>
   <longdescription lang="en">
   MathJax is an open-source JavaScript display engine for LaTeX and
diff --git a/dev-python/lxml-html-clean/metadata.xml b/dev-python/lxml-html-clean/metadata.xml
index fb6f3eebe669b..83c5369b6c54b 100644
--- a/dev-python/lxml-html-clean/metadata.xml
+++ b/dev-python/lxml-html-clean/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>eschwartz93@gmail.com</email>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
 		<name>Eli Schwartz</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/unrardll/metadata.xml b/dev-python/unrardll/metadata.xml
index 34d0dccf4daa5..f6fa47e592ae8 100644
--- a/dev-python/unrardll/metadata.xml
+++ b/dev-python/unrardll/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>eschwartz93@gmail.com</email>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
 		<name>Eli Schwartz</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-util/ruff/metadata.xml b/dev-util/ruff/metadata.xml
index 7e79e42be8c23..ab22b282ba537 100644
--- a/dev-util/ruff/metadata.xml
+++ b/dev-util/ruff/metadata.xml
@@ -5,8 +5,8 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>eschwartz93@gmail.com</email>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
 		<name>Eli Schwartz</name>
 	</maintainer>
 	<upstream>
diff --git a/net-libs/libpsl/metadata.xml b/net-libs/libpsl/metadata.xml
index 1a69cf2503891..89727fa85f300 100644
--- a/net-libs/libpsl/metadata.xml
+++ b/net-libs/libpsl/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>eschwartz93@gmail.com</email>
+  <maintainer type="person">
+    <email>eschwartz@gentoo.org</email>
     <name>Eli Schwartz</name>
   </maintainer>
-  <maintainer type="person" proxied="proxy">
-    <email>kangie@gentoo.org</email>
-    <name>Matt Jolly</name>
-  </maintainer>
   <upstream>
     <remote-id type="github">rockdaboot/libpsl</remote-id>
   </upstream>
diff --git a/net-p2p/qbittorrent/metadata.xml b/net-p2p/qbittorrent/metadata.xml
index 71922151656d2..5f226839384f3 100644
--- a/net-p2p/qbittorrent/metadata.xml
+++ b/net-p2p/qbittorrent/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>eschwartz93@gmail.com</email>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
 		<name>Eli Schwartz</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="webui">
 			Install qBittorrent Web UI (qbittorrent-nox) and systemd/OpenRC service
diff --git a/sec-keys/openpgp-keys-jpakkane/metadata.xml b/sec-keys/openpgp-keys-jpakkane/metadata.xml
index 667a16a60d08a..b8e59eca0e4ab 100644
--- a/sec-keys/openpgp-keys-jpakkane/metadata.xml
+++ b/sec-keys/openpgp-keys-jpakkane/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>eschwartz93@gmail.com</email>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
 		<name>Eli Schwartz</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/sec-keys/openpgp-keys-qbittorrent/metadata.xml b/sec-keys/openpgp-keys-qbittorrent/metadata.xml
index 667a16a60d08a..b8e59eca0e4ab 100644
--- a/sec-keys/openpgp-keys-qbittorrent/metadata.xml
+++ b/sec-keys/openpgp-keys-qbittorrent/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>eschwartz93@gmail.com</email>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
 		<name>Eli Schwartz</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/sys-kernel/modprobed-db/metadata.xml b/sys-kernel/modprobed-db/metadata.xml
index b88440da01209..6e401d42b2887 100644
--- a/sys-kernel/modprobed-db/metadata.xml
+++ b/sys-kernel/modprobed-db/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>eschwartz93@gmail.com</email>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
 		<name>Eli Schwartz</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">graysky2/modprobed-db</remote-id>
 	</upstream>