diff --git a/MAINTAINERS b/MAINTAINERS
index 167da0f..a67d753 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -194,7 +194,7 @@
 I:	ipsec
 M:	Neale Ranns <neale@graphiant.com>
 M:	Radu Nicolau <radu.nicolau@intel.com>
-M:	Fan Zhang <roy.fan.zhang@intel.com>
+M:	Fan Zhang <fanzhang.oss@gmail.com>
 F:	src/vnet/ipsec/
 
 VNET Crypto Infra
@@ -226,12 +226,12 @@
 Plugin - Crypto - ipsecmb
 I:	crypto-ipsecmb
 M:	Neale Ranns <neale@graphiant.com>
-M:      Fan Zhang <roy.fan.zhang@intel.com>
+M:      Fan Zhang <fanzhang.oss@gmail.com>
 F:	src/plugins/crypto_ipsecmb/
 
 Plugin - Crypto - sw_scheduler
 I:	crypto-sw-scheduler
-M:	Fan Zhang <roy.fan.zhang@intel.com>
+M:	Fan Zhang <fanzhang.oss@gmail.com>
 F:	src/plugs/crypto_sw_scheduler/
 
 VNET L2
@@ -419,7 +419,7 @@
 Plugin - DPDK Crypto
 I:	dpdk-cryptodev
 M:	Radu Nicolau <radu.nicolau@intel.com>
-M:	Fan Zhang <roy.fan.zhang@intel.com>
+M:	Fan Zhang <fanzhang.oss@gmail.com>
 F:	src/plugins/dpdk/cryptodev/
 
 Plugin - flowprobe
@@ -751,7 +751,7 @@
 Plugin - Wireguard
 I:	wireguard
 M:	Artem Glazychev <artem.glazychev@xored.com>
-M:	Fan Zhang <roy.fan.zhang@intel.com>
+M:	Fan Zhang <fanzhang.oss@gmail.com>
 F:	src/plugins/wireguard
 
 Packetforge
@@ -854,7 +854,7 @@
 
 VPP StrongSwan Daemon
 I:	vpp-swan
-M:	Fan Zhang <roy.fan.zhang@intel.com>
+M:	Fan Zhang <fanzhang.oss@gmail.com>
 M:	Gabriel Oginski <gabrielx.oginski@intel.com>
 F:	extras/strongswan/vpp_sswan