diff --git a/acct-group/sonar/metadata.xml b/acct-group/sonar/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/acct-group/sonar/metadata.xml
+++ b/acct-group/sonar/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/acct-group/spiderfoot/metadata.xml b/acct-group/spiderfoot/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/acct-group/spiderfoot/metadata.xml
+++ b/acct-group/spiderfoot/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/acct-group/vuls/metadata.xml b/acct-group/vuls/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/acct-group/vuls/metadata.xml
+++ b/acct-group/vuls/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/acct-user/sonar/metadata.xml b/acct-user/sonar/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/acct-user/sonar/metadata.xml
+++ b/acct-user/sonar/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/acct-user/spiderfoot/metadata.xml b/acct-user/spiderfoot/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/acct-user/spiderfoot/metadata.xml
+++ b/acct-user/spiderfoot/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/acct-user/vuls/metadata.xml b/acct-user/vuls/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/acct-user/vuls/metadata.xml
+++ b/acct-user/vuls/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/app-admin/genmenu/metadata.xml b/app-admin/genmenu/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/app-admin/genmenu/metadata.xml
+++ b/app-admin/genmenu/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/app-antivirus/lkrg/metadata.xml b/app-antivirus/lkrg/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/app-antivirus/lkrg/metadata.xml
+++ b/app-antivirus/lkrg/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/app-antivirus/malheur/metadata.xml b/app-antivirus/malheur/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/app-antivirus/malheur/metadata.xml
+++ b/app-antivirus/malheur/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/app-antivirus/tyton/metadata.xml b/app-antivirus/tyton/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/app-antivirus/tyton/metadata.xml
+++ b/app-antivirus/tyton/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/app-antivirus/veil/metadata.xml b/app-antivirus/veil/metadata.xml
index c5cb2805e..7995bd04f 100644
--- a/app-antivirus/veil/metadata.xml
+++ b/app-antivirus/veil/metadata.xml
@@ -1,9 +1,9 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon