diff --git a/Maintainers.txt b/Maintainers.txt
index 3a690b2ee2..31ec66b3cb 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -209,10 +209,6 @@ 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@linaro.org>
-R: Marc-André Lureau <marcandre.lureau@redhat.com>
-   (TPM2 modules)
-R: Stefan Berger <stefanb@linux.ibm.com>
-   (TPM2 modules)
 R: David Woodhouse <dwmw2@infradead.org>
    (CSM modules)
 S: Maintained
@@ -241,6 +237,15 @@ F: OvmfPkg/XenPvBlkDxe/
 R: Anthony Perard <anthony.perard@citrix.com>
 R: Julien Grall <julien.grall@arm.com>
 
+OvmfPkg: TCG- and TPM2-related modules
+F: OvmfPkg/Include/IndustryStandard/QemuTpm.h
+F: OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+F: OvmfPkg/Library/Tcg2PhysicalPresenceLib*/
+F: OvmfPkg/PlatformPei/ClearCache.c
+F: OvmfPkg/Tcg/
+R: Marc-André Lureau <marcandre.lureau@redhat.com>
+R: Stefan Berger <stefanb@linux.ibm.com>
+
 PcAtChipsetPkg
 F: PcAtChipsetPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/PcAtChipsetPkg