diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
index e7e6dc1446..19157283a6 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -212,6 +212,31 @@ READ_LOCK_STATUS   = TRUE
   # after the device drivers (eg: Ethernet) to ensure we have support for them.
   INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
 
+!ifdef $(DTB_DIR)
+  #
+  # Embed flattened device tree (FDT) images for all known
+  # variants of this platform
+  #
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpBaseAEMv8x4GicV2) {
+    $(DTB_DIR)/fvp-base-gicv2-psci.dtb
+  }
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpBaseAEMv8x4GicV2Legacy) {
+    $(DTB_DIR)/fvp-base-gicv2legacy-psci.dtb
+  }
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpBaseAEMv8x4GicV3) {
+    $(DTB_DIR)/fvp-base-gicv3-psci.dtb
+  }
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpFoundationGicV2) {
+    $(DTB_DIR)/fvp-foundation-gicv2-psci.dtb
+  }
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpFoundationGicV2Legacy) {
+    $(DTB_DIR)/fvp-foundation-gicv2legacy-psci.dtb
+  }
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpFoundationGicV3) {
+    $(DTB_DIR)/fvp-foundation-gicv3-psci.dtb
+  }
+!endif
+
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 16
 ERASE_POLARITY     = 1