diff --git a/meta-arm/recipes-bsp/hafnium/hafnium/native-dtc.patch b/meta-arm/recipes-bsp/hafnium/hafnium/native-dtc.patch
new file mode 100644
index 00000000..8cdb0601
--- /dev/null
+++ b/meta-arm/recipes-bsp/hafnium/hafnium/native-dtc.patch
@@ -0,0 +1,14 @@
+diff --git a/build/image/dtc.py b/build/image/dtc.py
+index d0778186..a5d831be 100755
+--- a/build/image/dtc.py
++++ b/build/image/dtc.py
+@@ -18,6 +18,9 @@ DTC_ROOT = os.path.join(HF_ROOT, "prebuilts", "linux-x64", "dtc")
+ DTC = os.path.join(DTC_ROOT, "dtc")
+ FDTOVERLAY = os.path.join(DTC_ROOT, "fdtoverlay")
+ 
++DTC =  "dtc"
++FDTOVERLAY = "fdtoverlay"
++
+ def cmd_compile(args):
+     exec_args = [
+             DTC,
diff --git a/meta-arm/recipes-bsp/hafnium/hafnium_2.5.bb b/meta-arm/recipes-bsp/hafnium/hafnium_2.5.bb
index 39aa14f9..dc248e48 100644
--- a/meta-arm/recipes-bsp/hafnium/hafnium_2.5.bb
+++ b/meta-arm/recipes-bsp/hafnium/hafnium_2.5.bb
@@ -1,5 +1,7 @@
 SUMMARY = "Hafnium"
 DESCRIPTION = "A reference Secure Partition Manager (SPM) for systems that implement the Armv8.4-A Secure-EL2 extension"
+DEPENDS = "gn-native ninja-native bison-native bc-native dtc-native openssl-native"
+
 LICENSE = "BSD-3-Clause & GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=782b40c14bad5294672c500501edc103"
 
@@ -9,7 +11,8 @@ inherit deploy python3native pkgconfig
 
 SRC_URI = "gitsm://git.trustedfirmware.org/hafnium/hafnium.git;protocol=https \
            file://hashbang.patch \
-           file://pkg-config-native.patch"
+           file://pkg-config-native.patch \
+           file://native-dtc.patch"
 SRCREV = "3a149eb219467c0d9336467ea1fb9d3fb65da94b"
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
@@ -26,13 +29,14 @@ HAFNIUM_PLATFORM ?= "invalid"
 # default to hafnium
 HAFNIUM_INSTALL_TARGET ?= "hafnium"
 
-DEPENDS = "bison-native bc-native openssl-native"
-
 # set project to build
 EXTRA_OEMAKE += "PROJECT=${HAFNIUM_PROJECT}"
 
 EXTRA_OEMAKE += "OUT_DIR=${B}"
 
+# Don't use prebuilt binaries for gn and ninja
+EXTRA_OEMAKE += "GN=${STAGING_BINDIR_NATIVE}/gn NINJA=${STAGING_BINDIR_NATIVE}/ninja"
+
 do_configure[cleandirs] += "${B}"
 
 do_compile() {