diff --git a/Maintainers.txt b/Maintainers.txt
index 32c9003a62..99362676b1 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -161,6 +161,7 @@ M: Liming Gao <liming.gao@intel.com>
 CryptoPkg
 F: CryptoPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/CryptoPkg
+M: Jiewen Yao <jiewen.yao@intel.com>
 M: Jian J Wang <jian.j.wang@intel.com>
 R: Xiaoyu Lu <xiaoyux.lu@intel.com>
 
@@ -458,7 +459,6 @@ F: SecurityPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/SecurityPkg
 M: Jiewen Yao <jiewen.yao@intel.com>
 M: Jian J Wang <jian.j.wang@intel.com>
-R: Chao Zhang <chao.b.zhang@intel.com>
 
 SecurityPkg: Secure boot related modules
 F: SecurityPkg/Library/DxeImageVerificationLib/
@@ -480,8 +480,7 @@ M: Zhichao Gao <zhichao.gao@intel.com>
 SignedCapsulePkg
 F: SignedCapsulePkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/SignedCapsulePkg
-M: Jiewen Yao <jiewen.yao@intel.com>
-M: Chao Zhang <chao.b.zhang@intel.com>
+M: Jian J Wang <jian.j.wang@intel.com>
 
 SourceLevelDebugPkg
 F: SourceLevelDebugPkg/