diff --git a/Maintainers.txt b/Maintainers.txt
index 4c5d3111c2..5d0679cb71 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -477,9 +477,9 @@ R: Tom Lendacky <thomas.lendacky@amd.com> [tlendacky]
 
 OvmfPkg: FDT related modules
 F: OvmfPkg/Fdt
-R: Leif Lindholm <leif@nuviainc.com>
-R: Gerd Hoffmann <kraxel@redhat.com>
-R: Abner Chang <abner.chang@hpe.com>
+R: Leif Lindholm <leif@nuviainc.com> [leiflindholm]
+R: Gerd Hoffmann <kraxel@redhat.com> [kraxel]
+R: Abner Chang <abner.chang@hpe.com> [changab]
 
 OvmfPkg: LsiScsi driver
 F: OvmfPkg/LsiScsiDxe/