diff --git a/acct-group/asterisk/metadata.xml b/acct-group/asterisk/metadata.xml
index 6aebbc46f559f..5a0914b10ce9c 100644
--- a/acct-group/asterisk/metadata.xml
+++ b/acct-group/asterisk/metadata.xml
@@ -1,12 +1,8 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-group/fluentd/metadata.xml b/acct-group/fluentd/metadata.xml
index 6aebbc46f559f..5a0914b10ce9c 100644
--- a/acct-group/fluentd/metadata.xml
+++ b/acct-group/fluentd/metadata.xml
@@ -1,12 +1,8 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-group/frr/metadata.xml b/acct-group/frr/metadata.xml
index 2be263cf694db..432266a43a11a 100644
--- a/acct-group/frr/metadata.xml
+++ b/acct-group/frr/metadata.xml
@@ -5,8 +5,8 @@
Alarig Le Lay
alarig@swordarmor.fr
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
diff --git a/acct-user/asterisk/metadata.xml b/acct-user/asterisk/metadata.xml
index 6aebbc46f559f..5a0914b10ce9c 100644
--- a/acct-user/asterisk/metadata.xml
+++ b/acct-user/asterisk/metadata.xml
@@ -1,12 +1,8 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-user/fluentd/metadata.xml b/acct-user/fluentd/metadata.xml
index 6aebbc46f559f..5a0914b10ce9c 100644
--- a/acct-user/fluentd/metadata.xml
+++ b/acct-user/fluentd/metadata.xml
@@ -1,12 +1,8 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-user/frr/metadata.xml b/acct-user/frr/metadata.xml
index 2be263cf694db..432266a43a11a 100644
--- a/acct-user/frr/metadata.xml
+++ b/acct-user/frr/metadata.xml
@@ -5,8 +5,8 @@
Alarig Le Lay
alarig@swordarmor.fr
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
diff --git a/app-admin/fluentd/metadata.xml b/app-admin/fluentd/metadata.xml
index effd619d79fe3..41a4fd48d0016 100644
--- a/app-admin/fluentd/metadata.xml
+++ b/app-admin/fluentd/metadata.xml
@@ -1,14 +1,10 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
Fluentd is an open source data collector which lets you unify
the data collection and consumption for a better use and
diff --git a/app-arch/createrepo_c/metadata.xml b/app-arch/createrepo_c/metadata.xml
index d68ba29545456..6a2d37e7ea389 100644
--- a/app-arch/createrepo_c/metadata.xml
+++ b/app-arch/createrepo_c/metadata.xml
@@ -1,8 +1,8 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
@@ -13,10 +13,6 @@
sam@gentoo.org
Sam James
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-db/mariadb-connector-odbc/metadata.xml b/dev-db/mariadb-connector-odbc/metadata.xml
index 327c7fa0c01f4..f4cc334ff4e08 100644
--- a/dev-db/mariadb-connector-odbc/metadata.xml
+++ b/dev-db/mariadb-connector-odbc/metadata.xml
@@ -1,14 +1,10 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
mariadb-corporation/mariadb-connector-odbc
diff --git a/dev-libs/libjwt/metadata.xml b/dev-libs/libjwt/metadata.xml
index b06eda457275e..6454d1a557f65 100644
--- a/dev-libs/libjwt/metadata.xml
+++ b/dev-libs/libjwt/metadata.xml
@@ -1,8 +1,8 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
diff --git a/dev-perl/X11-Protocol-Other/metadata.xml b/dev-perl/X11-Protocol-Other/metadata.xml
index ba462d8271644..f68365c773303 100644
--- a/dev-perl/X11-Protocol-Other/metadata.xml
+++ b/dev-perl/X11-Protocol-Other/metadata.xml
@@ -1,12 +1,8 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-php/pecl-parallel/metadata.xml b/dev-php/pecl-parallel/metadata.xml
index 814fa26c2a8e2..c9f8e3f4296dd 100644
--- a/dev-php/pecl-parallel/metadata.xml
+++ b/dev-php/pecl-parallel/metadata.xml
@@ -1,14 +1,10 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
krakjoe/parallel
diff --git a/dev-php/pecl-xattr/metadata.xml b/dev-php/pecl-xattr/metadata.xml
index 6aebbc46f559f..5a0914b10ce9c 100644
--- a/dev-php/pecl-xattr/metadata.xml
+++ b/dev-php/pecl-xattr/metadata.xml
@@ -1,12 +1,8 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-util/lockrun/metadata.xml b/dev-util/lockrun/metadata.xml
index 6aebbc46f559f..5a0914b10ce9c 100644
--- a/dev-util/lockrun/metadata.xml
+++ b/dev-util/lockrun/metadata.xml
@@ -1,12 +1,8 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index 197c5396ad917..18496eb4e6b49 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -1,14 +1,10 @@
-
- jaco@uls.co.za
+
+ jkroon@gentoo.org
Jaco Kroon
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-