diff --git a/components/rpc/ts_rpc/caller/linux/component.cmake b/components/rpc/ts_rpc/caller/linux/component.cmake
index 2df09d1..c9f439e 100644
--- a/components/rpc/ts_rpc/caller/linux/component.cmake
+++ b/components/rpc/ts_rpc/caller/linux/component.cmake
@@ -8,6 +8,7 @@
 	message(FATAL_ERROR "mandatory parameter TGT is not defined.")
 endif()
 
+include(${TS_ROOT}/external/LinuxFfaTeeDriver/LinuxFfaTeeDriver.cmake)
 
 set_property(TARGET ${TGT} APPEND PROPERTY PUBLIC_HEADER
 	"${CMAKE_CURRENT_LIST_DIR}/ts_rpc_caller_linux.h"
@@ -16,3 +17,7 @@
 target_sources(${TGT} PRIVATE
 	"${CMAKE_CURRENT_LIST_DIR}/ts_rpc_caller_linux.c"
 	)
+
+target_include_directories(${TGT} PRIVATE
+	"${LINUX_FFA_TEE_DRIVER_INCLUDE_DIR}"
+	)
diff --git a/components/rpc/ts_rpc/caller/linux/ts_rpc_caller_linux.c b/components/rpc/ts_rpc/caller/linux/ts_rpc_caller_linux.c
index b9fca47..7c4606e 100644
--- a/components/rpc/ts_rpc/caller/linux/ts_rpc_caller_linux.c
+++ b/components/rpc/ts_rpc/caller/linux/ts_rpc_caller_linux.c
@@ -6,6 +6,7 @@
 
 #include "ts_rpc_caller_linux.h"
 
+#include <arm_tstee.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/tee.h>
@@ -23,7 +24,6 @@
 
 #define INVALID_SESS_ID		  0
 #define MAX_TEE_DEV_NUM		  16
-#define TEE_IMPL_ID_TS_TEE	  3
 #define TS_TEE_DRV_REQ_VER_MAJOR  2
 #define TS_TEE_DRV_REQ_VER_MINOR  0
 #define TS_TEE_DRV_REQ_VER_PATCH  0
@@ -299,7 +299,7 @@
 		rc = ioctl(fd, TEE_IOC_VERSION, &vers);
 		close(fd);
 
-		if (!rc && vers.impl_id == TEE_IMPL_ID_TS_TEE) {
+		if (!rc && vers.impl_id == TEE_IMPL_ID_TSTEE) {
 			ts_tee_devs[ts_tee_dev_index].endpoint_id = vers.impl_caps;
 			memcpy(ts_tee_devs[ts_tee_dev_index].path, path, sizeof(path));
 			ts_tee_dev_index++;
diff --git a/external/LinuxFfaTeeDriver/LinuxFfaTeeDriver.cmake b/external/LinuxFfaTeeDriver/LinuxFfaTeeDriver.cmake
index d774c24..da0a5b3 100644
--- a/external/LinuxFfaTeeDriver/LinuxFfaTeeDriver.cmake
+++ b/external/LinuxFfaTeeDriver/LinuxFfaTeeDriver.cmake
@@ -7,7 +7,7 @@
 
 # If the driver is already installed, try to find that
 find_path(LINUX_FFA_TEE_DRIVER_INCLUDE_DIR
-	NAMES arm_ffa_tee.h
+	NAMES arm_tstee.h
 	DOC "Linux FF-A TEE driver include directory"
 )
 
@@ -18,7 +18,7 @@
 
 	# Note: the aim of this external component is to make the header file defining the IOCTL API
 	#        available. Fetching a moving reference is ok as long as API compatibility is guaranteed.
-	set(LINUX_FFA_TEE_DRIVER_REFSPEC "origin/tee-v1"
+	set(LINUX_FFA_TEE_DRIVER_REFSPEC "origin/tee-v2"
 		CACHE STRING "Linux FF-A TEE driver git refspec")
 
 	set(LINUX_FFA_TEE_DRIVER_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/linux_ffa_tee_driver-src"
@@ -42,7 +42,7 @@
 		)
 
 	find_path(LINUX_FFA_TEE_DRIVER_INCLUDE_DIR
-		NAMES arm_ffa_tee.h
+		NAMES arm_tstee.h
 		PATHS ${LINUX_FFA_TEE_DRIVER_SOURCE_DIR}/uapi
 		NO_DEFAULT_PATH
 		REQUIRED
@@ -51,4 +51,4 @@
 endif()
 
 set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
-	"${LINUX_FFA_TEE_DRIVER_INCLUDE_DIR}/arm_ffa_tee.h")
+	"${LINUX_FFA_TEE_DRIVER_INCLUDE_DIR}/arm_tstee.h")