diff --git a/Maintainers.txt b/Maintainers.txt
index 7e46996..2cd3565 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -88,7 +88,7 @@
 M: Ray Ni <ray.ni@intel.com>                  (Ia32/X64)
 M: Zhichao Gao <zhichao.gao@intel.com>        (Ia32/X64)
 M: Leif Lindholm <leif@nuviainc.com>          (ARM/AArch64)
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>    (ARM/AArch64)
+M: Ard Biesheuvel <ardb+tianocore@kernel.org> (ARM/AArch64)
 
 EDK II Architectures:
 ---------------------
@@ -96,7 +96,7 @@
 F: */AArch64/
 F: */Arm/
 M: Leif Lindholm <leif@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+M: Ard Biesheuvel <ardb+tianocore@kernel.org>
 
 RISCV64
 F: */RiscV64/
@@ -132,19 +132,19 @@
 F: ArmPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg
 M: Leif Lindholm <leif@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+M: Ard Biesheuvel <ardb+tianocore@kernel.org>
 
 ArmPlatformPkg
 F: ArmPlatformPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
 M: Leif Lindholm <leif@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+M: Ard Biesheuvel <ardb+tianocore@kernel.org>
 
 ArmVirtPkg
 F: ArmVirtPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
 M: Laszlo Ersek <lersek@redhat.com>
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+M: Ard Biesheuvel <ardb+tianocore@kernel.org>
 R: Leif Lindholm <leif@nuviainc.com>
 
 ArmVirtPkg: modules used on Xen
@@ -192,7 +192,7 @@
 F: EmbeddedPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg
 M: Leif Lindholm <leif@nuviainc.com>
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+M: Ard Biesheuvel <ardb+tianocore@kernel.org>
 
 EmulatorPkg
 F: EmulatorPkg/
@@ -426,7 +426,7 @@
 W: http://www.tianocore.org/ovmf/
 M: Jordan Justen <jordan.l.justen@intel.com>
 M: Laszlo Ersek <lersek@redhat.com>
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+M: Ard Biesheuvel <ardb+tianocore@kernel.org>
 S: Maintained
 
 OvmfPkg: bhyve-related modules
@@ -553,7 +553,7 @@
 
 StandaloneMmPkg
 F: StandaloneMmPkg/
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+M: Ard Biesheuvel <ardb+tianocore@kernel.org>
 M: Sami Mujawar <sami.mujawar@arm.com>
 M: Jiewen Yao <jiewen.yao@intel.com>
 R: Supreeth Venkatesh <supreeth.venkatesh@arm.com>