diff --git a/hikey.mk b/hikey.mk
index 85e33a14769ff198bd59d14c20758b19aba6f884..3f6fd87c6d241b883657cfbece7ac6c102f16c9f 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -84,9 +84,11 @@ ARM_TF_EXPORTS ?= \
 	CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)"
 
 ARM_TF_FLAGS ?= \
-	BL32=$(OPTEE_OS_BIN) \
+	BL32=$(OPTEE_OS_HEADER_V2_BIN) \
+	BL32_EXTRA1=$(OPTEE_OS_PAGER_V2_BIN) \
+	BL32_EXTRA2=$(OPTEE_OS_PAGEABLE_V2_BIN) \
 	BL33=$(EDK2_BIN) \
-	BL30=$(MCUIMAGE_BIN) \
+	SCP_BL2=$(MCUIMAGE_BIN) \
 	DEBUG=$(DEBUG) \
 	PLAT=hikey \
 	SPD=opteed
diff --git a/hikey_debian.mk b/hikey_debian.mk
index 8d51a57cbf318f421590d35e8dc91da8cd951cf8..29cc7619e7a622123c33b82cd18cabe1bd06d754 100644
--- a/hikey_debian.mk
+++ b/hikey_debian.mk
@@ -110,9 +110,11 @@ ARM_TF_EXPORTS ?= \
 	CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)"
 
 ARM_TF_FLAGS ?= \
-	BL32=$(OPTEE_OS_BIN) \
+	BL32=$(OPTEE_OS_HEADER_V2_BIN) \
+	BL32_EXTRA1=$(OPTEE_OS_PAGER_V2_BIN) \
+	BL32_EXTRA2=$(OPTEE_OS_PAGEABLE_V2_BIN) \
 	BL33=$(EDK2_BIN) \
-	BL30=$(MCUIMAGE_BIN) \
+	SCP_BL2=$(MCUIMAGE_BIN) \
 	DEBUG=$(DEBUG) \
 	PLAT=hikey \
 	SPD=opteed