diff --git a/acct-group/gns3/metadata.xml b/acct-group/gns3/metadata.xml
index 65416c3036a69..d9f344e826fd4 100644
--- a/acct-group/gns3/metadata.xml
+++ b/acct-group/gns3/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>mmk@levelnine.at</email>
+	<maintainer type="person">
+		<email>mm1ke@gentoo.org</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/acct-group/ubridge/metadata.xml b/acct-group/ubridge/metadata.xml
index 65416c3036a69..d9f344e826fd4 100644
--- a/acct-group/ubridge/metadata.xml
+++ b/acct-group/ubridge/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>mmk@levelnine.at</email>
+	<maintainer type="person">
+		<email>mm1ke@gentoo.org</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/gns3/metadata.xml b/acct-user/gns3/metadata.xml
index 65416c3036a69..d9f344e826fd4 100644
--- a/acct-user/gns3/metadata.xml
+++ b/acct-user/gns3/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>mmk@levelnine.at</email>
+	<maintainer type="person">
+		<email>mm1ke@gentoo.org</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/dynamips/metadata.xml b/app-emulation/dynamips/metadata.xml
index 82c5a4ca25bcd..b2e6bc44bf881 100644
--- a/app-emulation/dynamips/metadata.xml
+++ b/app-emulation/dynamips/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>mmk@levelnine.at</email>
+	<maintainer type="person">
+		<email>mm1ke@gentoo.org</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gns-3</remote-id>
 		<remote-id type="github">GNS3/dynamips</remote-id>
diff --git a/app-misc/radeontop/metadata.xml b/app-misc/radeontop/metadata.xml
index 3a2761d4f806a..24c1cadf2df34 100644
--- a/app-misc/radeontop/metadata.xml
+++ b/app-misc/radeontop/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>mmk@levelnine.at</email>
+	<maintainer type="person">
+		<email>mm1ke@gentoo.org</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">clbr/radeontop</remote-id>
 	</upstream>
diff --git a/gui-apps/tuigreet/metadata.xml b/gui-apps/tuigreet/metadata.xml
index 4023c241118f4..92949dbb78ea8 100644
--- a/gui-apps/tuigreet/metadata.xml
+++ b/gui-apps/tuigreet/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>mmk@levelnine.at</email>
+	<maintainer type="person">
+		<email>mm1ke@gentoo.org</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">apognu/tuigreet</remote-id>
 		<bugs-to>https://github.com/apognu/tuigreet/issues</bugs-to>
diff --git a/net-misc/gns3-gui/metadata.xml b/net-misc/gns3-gui/metadata.xml
index b7766f3a2a0bf..1b96ac5683782 100644
--- a/net-misc/gns3-gui/metadata.xml
+++ b/net-misc/gns3-gui/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>mmk@levelnine.at</email>
+	<maintainer type="person">
+		<email>mm1ke@gentoo.org</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gns-3</remote-id>
 		<remote-id type="github">GNS3/gns3-server</remote-id>
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index b7766f3a2a0bf..1b96ac5683782 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-server/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>mmk@levelnine.at</email>
+	<maintainer type="person">
+		<email>mm1ke@gentoo.org</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gns-3</remote-id>
 		<remote-id type="github">GNS3/gns3-server</remote-id>
diff --git a/net-misc/sipcalc/metadata.xml b/net-misc/sipcalc/metadata.xml
index 65416c3036a69..d9f344e826fd4 100644
--- a/net-misc/sipcalc/metadata.xml
+++ b/net-misc/sipcalc/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>mmk@levelnine.at</email>
+	<maintainer type="person">
+		<email>mm1ke@gentoo.org</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>