diff --git a/acct-group/apt-cacher-ng/metadata.xml b/acct-group/apt-cacher-ng/metadata.xml
index 564caa887549c..05b4e10bdc62e 100644
--- a/acct-group/apt-cacher-ng/metadata.xml
+++ b/acct-group/apt-cacher-ng/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-			<email>jchelmert3@posteo.net</email>
-			<name>John Helmert III</name>
-	</maintainer>
-	<maintainer type="project">
-			<email>proxy-maint@gentoo.org</email>
-			<name>Proxy Maintainers</name>
+		<email>ajak@gentoo.org</email>
+		<name>John Helmert III</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/apt-cacher-ng/metadata.xml b/acct-user/apt-cacher-ng/metadata.xml
index 7e5108e69f900..05b4e10bdc62e 100644
--- a/acct-user/apt-cacher-ng/metadata.xml
+++ b/acct-user/apt-cacher-ng/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person">
-                        <email>jchelmert3@posteo.net</email>
-                        <name>John Helmert III</name>
-        </maintainer>
-        <maintainer type="project">
-                        <email>proxy-maint@gentoo.org</email>
-                        <name>Proxy Maintainers</name>
-        </maintainer>
+	<maintainer type="person">
+		<email>ajak@gentoo.org</email>
+		<name>John Helmert III</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/cutter/metadata.xml b/dev-util/cutter/metadata.xml
index f8896da76b613..0afa8c3be238c 100644
--- a/dev-util/cutter/metadata.xml
+++ b/dev-util/cutter/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jchelmert3@posteo.net</email>
+		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">radareorg/cutter</remote-id>
 	</upstream>
diff --git a/games-emulation/openmsx/metadata.xml b/games-emulation/openmsx/metadata.xml
index 4ae0b02dc3891..f8f80fa632e59 100644
--- a/games-emulation/openmsx/metadata.xml
+++ b/games-emulation/openmsx/metadata.xml
@@ -6,12 +6,8 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<maintainer type="person">
-			<email>jchelmert3@posteo.net</email>
-			<name>John Helmert III</name>
-	</maintainer>
-	<maintainer type="project">
-			<email>proxy-maint@gentoo.org</email>
-			<name>Proxy Maintainers</name>
+		<email>ajak@gentoo.org</email>
+		<name>John Helmert III</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">openmsx/openmsx</remote-id>
diff --git a/media-sound/pulsemixer/metadata.xml b/media-sound/pulsemixer/metadata.xml
index 5cffdd8cf98c6..4f1b4e8b06beb 100644
--- a/media-sound/pulsemixer/metadata.xml
+++ b/media-sound/pulsemixer/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jchelmert3@posteo.net</email>
+		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">GeorgeFilipkin/pulsemixer</remote-id>
 		<changelog>https://github.com/GeorgeFilipkin/pulsemixer/releases</changelog>
diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index 453387392cc22..70b0627d80869 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-ng/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-			<email>jchelmert3@posteo.net</email>
-			<name>John Helmert III</name>
-	</maintainer>
-	<maintainer type="project">
-			<email>proxy-maint@gentoo.org</email>
-			<name>Proxy Maintainers</name>
+		<email>ajak@gentoo.org</email>
+		<name>John Helmert III</name>
 	</maintainer>
 	<use>
 		<flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag>
diff --git a/net-p2p/tremc/metadata.xml b/net-p2p/tremc/metadata.xml
index 9a9bca135251d..db034ba870ff3 100644
--- a/net-p2p/tremc/metadata.xml
+++ b/net-p2p/tremc/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jchelmert3@posteo.net</email>
+		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">tremc/tremc</remote-id>
 	</upstream>
diff --git a/www-misc/buku/metadata.xml b/www-misc/buku/metadata.xml
index 720bd83b95be8..78e2eccd3d48a 100644
--- a/www-misc/buku/metadata.xml
+++ b/www-misc/buku/metadata.xml
@@ -6,7 +6,7 @@
 		<name>David Roman</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>jchelmert3@posteo.net</email>
+		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/x11-misc/polybar/metadata.xml b/x11-misc/polybar/metadata.xml
index 37f978d5dcef1..ba31ba3ca913a 100644
--- a/x11-misc/polybar/metadata.xml
+++ b/x11-misc/polybar/metadata.xml
@@ -6,13 +6,9 @@
 		<name>Johannes Huber</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>jchelmert3@posteo.net</email>
+		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="i3wm">Add support for i3 window manager</flag>
 		<flag name="ipc">Add support for Inter-Process Messaging</flag>
diff --git a/x11-wm/i3-gaps/metadata.xml b/x11-wm/i3-gaps/metadata.xml
index fbc9f75179177..2e166989d8d43 100644
--- a/x11-wm/i3-gaps/metadata.xml
+++ b/x11-wm/i3-gaps/metadata.xml
@@ -6,13 +6,9 @@
 		<name>Johannes Huber</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>jchelmert3@posteo.net</email>
+		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">Airblader/i3</remote-id>
 	</upstream>