diff --git a/environments/opteesp/component.cmake b/environments/opteesp/component.cmake
index 36cbc20..2b54682 100644
--- a/environments/opteesp/component.cmake
+++ b/environments/opteesp/component.cmake
@@ -15,7 +15,7 @@
 # Ensure elf output naming is symbolize.py compatible.
 # If binary UUID is not defined, fall back to using the SP UUID value.
 if (NOT SP_BIN_UUID_CANON)
-	set(SP_BIN_UUID_CANON "${SP_UUID_CANON}")
+	set(SP_BIN_UUID_CANON "${SP_FFA_UUID_CANON}")
 endif()
 ts_add_uuid_to_exe_name(TGT "${TGT}" UUID "${SP_BIN_UUID_CANON}" )
 
@@ -30,9 +30,10 @@
 
 	include(${TS_ROOT}/tools/cmake/common/TargetCompileDefinitions.cmake)
 	set_target_uuids(
-		SP_UUID ${SP_UUID_CANON}
+		SP_UUID ${SP_FFA_UUID_CANON}
 		TGT ${SP_NAME}
 	)
+
 endif()
 
 target_sources(${TGT} PRIVATE
diff --git a/environments/opteesp/sp_pkg.json.in b/environments/opteesp/sp_pkg.json.in
index 9798c66..02ee474 100644
--- a/environments/opteesp/sp_pkg.json.in
+++ b/environments/opteesp/sp_pkg.json.in
@@ -1,6 +1,7 @@
 {
 	"@EXPORT_SP_NAME@": {
-		"image": "../bin/@EXPORT_SP_UUID_CANON@.stripped.elf",
-		"pm": "../manifest/@EXPORT_SP_UUID_CANON@.dts"
+		"uuid": "@EXPORT_SP_BIN_UUID_CANON@",
+		"image": "../bin/@EXPORT_SP_BIN_UUID_CANON@.stripped.elf",
+		"pm": "../manifest/@EXPORT_SP_BIN_UUID_CANON@.dts"
 	}
-}
\ No newline at end of file
+}
diff --git a/environments/sp/component.cmake b/environments/sp/component.cmake
index 3f3b0b4..35532bd 100644
--- a/environments/sp/component.cmake
+++ b/environments/sp/component.cmake
@@ -6,7 +6,7 @@
 #-------------------------------------------------------------------------------
 
 # Check mandatory variables.
-foreach(_var IN ITEMS TGT TRACE_PREFIX SP_HEAP_SIZE SP_STACK_SIZE SP_UUID_CANON)
+foreach(_var IN ITEMS TGT TRACE_PREFIX SP_HEAP_SIZE SP_STACK_SIZE SP_FFA_UUID_CANON)
 	if (NOT DEFINED ${_var})
 		message(FATAL_ERROR "Mandatory parameter '${_var}' missing.")
 	endif()
@@ -15,7 +15,7 @@
 # Ensure elf output naming is symbolize.py compatible.
 # If binary UUID is not defined, fall back to using the SP UUID value.
 if (NOT SP_BIN_UUID_CANON)
-	set(SP_BIN_UUID_CANON "${SP_UUID_CANON}")
+	set(SP_BIN_UUID_CANON "${SP_FFA_UUID_CANON}")
 endif()
 ts_add_uuid_to_exe_name(TGT "${TGT}" UUID "${SP_BIN_UUID_CANON}" )
 
diff --git a/environments/sp/sp_pkg.json.in b/environments/sp/sp_pkg.json.in
index fbc3a59..23e8805 100644
--- a/environments/sp/sp_pkg.json.in
+++ b/environments/sp/sp_pkg.json.in
@@ -1,6 +1,7 @@
 {
 	"@EXPORT_SP_NAME@": {
-		"image": "../bin/@EXPORT_SP_UUID_CANON@.bin",
-		"pm": "../manifest/@EXPORT_SP_UUID_CANON@.dts"
+		"uuid": "@EXPORT_SP_BIN_UUID_CANON@",
+		"image": "../bin/@EXPORT_SP_BIN_UUID_CANON@.bin",
+		"pm": "../manifest/@EXPORT_SP_BIN_UUID_CANON@.dts"
 	}
 }
\ No newline at end of file