diff --git a/fvp_ffa.mk b/fvp_ffa.mk
index 5ef3c04..6a4687a 100644
--- a/fvp_ffa.mk
+++ b/fvp_ffa.mk
@@ -261,14 +261,30 @@
 		head -c -1 > $(SHARED_DIR)/sp_uuid_list.txt
 
 # Add targets to build the "arm_ffa_user" Linux Kernel module.
-arm_ffa_user: sp_uuid_list linux
+arm_ffa_user: sp_uuid_list linux | $(OUT_PATH)
 	$(eval ROOT:=$(CURDIR)/..)
-	make -C $(CURDIR)/../linux_poc $(LINUX_COMMON_FLAGS) install
+	mkdir -p $(OUT_PATH)/arm_ffa_user
+	make -C $(CURDIR)/../linux_poc $(LINUX_COMMON_FLAGS) install TARGET_DIR=$(OUT_PATH)/arm_ffa_user
 
 arm_ffa_user_clean:
 	make -C $(CURDIR)/../linux_poc clean
 
-all: arm_ffa_user
+arm_ffa_tee: linux  | $(OUT_PATH)
+	$(eval ROOT:=$(CURDIR)/..)
+	mkdir -p $(OUT_PATH)/arm_ffa_tee
+	make -C $(CURDIR)/../linux_tee $(LINUX_COMMON_FLAGS) install TARGET_DIR=$(OUT_PATH)/arm_ffa_tee
+
+arm_ffa_tee_clean:
+	make -C $(CURDIR)/../linux_tee clean
+
+# Copy out-of-tree kernel modules to shared directory and concatenate module load scripts.
+arm_ffa_drivers: arm_ffa_tee arm_ffa_user | shared_directory
+	cat $(OUT_PATH)/arm_ffa_tee/load_module.sh $(OUT_PATH)/arm_ffa_user/load_module.sh > $(SHARED_DIR)/load_module.sh
+	chmod 775 $(SHARED_DIR)/load_module.sh
+	cp -u $(OUT_PATH)/arm_ffa_tee/arm-ffa-tee.ko $(SHARED_DIR)
+	cp -u $(OUT_PATH)/arm_ffa_user/arm-ffa-user.ko $(SHARED_DIR)
+
+all: arm_ffa_drivers
 
 # Disable CONFIG_STRICT_DEVMEM option in the Linux kernel config. This allows userspace access to
 # the whole NS physical address space through /dev/mem.