diff --git a/acct-group/i2p/metadata.xml b/acct-group/i2p/metadata.xml
index 3720a21d3c73..fa598ccbac56 100644
--- a/acct-group/i2p/metadata.xml
+++ b/acct-group/i2p/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person" proxied="yes">
-	<email>tharvik@gmail.com</email>
+	<email>tharvik@proton.me</email>
 	<name>Valérian Rousset</name>
 </maintainer>
 <maintainer type="project">
diff --git a/acct-user/i2p/metadata.xml b/acct-user/i2p/metadata.xml
index 3720a21d3c73..fa598ccbac56 100644
--- a/acct-user/i2p/metadata.xml
+++ b/acct-user/i2p/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person" proxied="yes">
-	<email>tharvik@gmail.com</email>
+	<email>tharvik@proton.me</email>
 	<name>Valérian Rousset</name>
 </maintainer>
 <maintainer type="project">
diff --git a/dev-java/cache2k-api/metadata.xml b/dev-java/cache2k-api/metadata.xml
index 496a7c76e966..1d9ee3e249f7 100644
--- a/dev-java/cache2k-api/metadata.xml
+++ b/dev-java/cache2k-api/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-java/cache2k-core/metadata.xml b/dev-java/cache2k-core/metadata.xml
index 496a7c76e966..1d9ee3e249f7 100644
--- a/dev-java/cache2k-core/metadata.xml
+++ b/dev-java/cache2k-core/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-java/hashcash/metadata.xml b/dev-java/hashcash/metadata.xml
index 2578eaba4e38..af85b3f66c94 100644
--- a/dev-java/hashcash/metadata.xml
+++ b/dev-java/hashcash/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-java/identicon/metadata.xml b/dev-java/identicon/metadata.xml
index 87f89724fd55..c88af2efa100 100644
--- a/dev-java/identicon/metadata.xml
+++ b/dev-java/identicon/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-java/jbcrypt/metadata.xml b/dev-java/jbcrypt/metadata.xml
index 2578eaba4e38..af85b3f66c94 100644
--- a/dev-java/jbcrypt/metadata.xml
+++ b/dev-java/jbcrypt/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-java/json-smart/metadata.xml b/dev-java/json-smart/metadata.xml
index d5b2471c532c..b969715601ef 100644
--- a/dev-java/json-smart/metadata.xml
+++ b/dev-java/json-smart/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-java/jsonrpc2-base/metadata.xml b/dev-java/jsonrpc2-base/metadata.xml
index 8ab1b3b4387d..21b33ece6c41 100644
--- a/dev-java/jsonrpc2-base/metadata.xml
+++ b/dev-java/jsonrpc2-base/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-java/jsonrpc2-server/metadata.xml b/dev-java/jsonrpc2-server/metadata.xml
index 0432ff238301..e140312de81c 100644
--- a/dev-java/jsonrpc2-server/metadata.xml
+++ b/dev-java/jsonrpc2-server/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-java/minidns-core/metadata.xml b/dev-java/minidns-core/metadata.xml
index 115bee3bf8c1..866fd30e1eb9 100644
--- a/dev-java/minidns-core/metadata.xml
+++ b/dev-java/minidns-core/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-java/zxing-core/metadata.xml b/dev-java/zxing-core/metadata.xml
index c77bb25a2b63..10ae8b018f5c 100644
--- a/dev-java/zxing-core/metadata.xml
+++ b/dev-java/zxing-core/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-java/zxing-javase/metadata.xml b/dev-java/zxing-javase/metadata.xml
index c77bb25a2b63..10ae8b018f5c 100644
--- a/dev-java/zxing-javase/metadata.xml
+++ b/dev-java/zxing-javase/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index fa444480afee..c83ec2ad518d 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>tharvik@gmail.com</email>
+		<email>tharvik@proton.me</email>
 		<name>Valérian Rousset</name>
 	</maintainer>
 	<maintainer type="project">