diff --git a/fvp.mk b/fvp.mk
index 40b5b26445eab9683ba32cfe6878266eaf2e49dd..e910c314d9bcec98ad9de87569ccf32a99b7b952 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -167,7 +167,7 @@ boot-img: linux grub buildroot
 	rm -f $(BOOT_IMG)
 	mformat -i $(BOOT_IMG) -n 64 -h 255 -T 131072 -v "BOOT IMG" -C ::
 	mcopy -i $(BOOT_IMG) $(LINUX_PATH)/arch/arm64/boot/Image ::
-	mcopy -i $(BOOT_IMG) $(LINUX_PATH)/arch/arm64/boot/dts/arm/foundation-v8.dtb ::
+	mcopy -i $(BOOT_IMG) $(LINUX_PATH)/arch/arm64/boot/dts/arm/foundation-v8-gicv3-psci.dtb ::
 	mmd -i $(BOOT_IMG) ::/EFI
 	mmd -i $(BOOT_IMG) ::/EFI/BOOT
 	mcopy -i $(BOOT_IMG) $(ROOT)/out-br/images/rootfs.cpio.gz ::/initrd.img
diff --git a/fvp/grub/grub.cfg b/fvp/grub/grub.cfg
index 6ddef3429c754143e6fd2478f5025fac1b53aab8..2b1fc8488c542ad8ffb0c1bd44630a4f7ecb59ce 100644
--- a/fvp/grub/grub.cfg
+++ b/fvp/grub/grub.cfg
@@ -6,5 +6,5 @@ set timeout=10
 menuentry 'GNU/Linux (OP-TEE)' {
     linux /Image console=tty0 console=ttyAMA0,115200 earlycon=pl011,0x1c090000 root=/dev/disk/by-partlabel/system rootwait rw ignore_loglevel efi=noruntime
     initrd /initrd.img
-    devicetree /foundation-v8.dtb
+    devicetree /foundation-v8-gicv3-psci.dtb
 }