diff --git a/fvp.mk b/fvp.mk
index f20312485066b7404d671bac837aaffd1256c7b5..504b3f45536492d18559ddf6038c5bffb473bf75 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -42,7 +42,9 @@ 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) \
 	DEBUG=0 \
 	ARM_TSP_RAM_LOCATION=tdram \