diff --git a/environments/opteesp/component.cmake b/environments/opteesp/component.cmake
index ec0cf34..526d8c8 100644
--- a/environments/opteesp/component.cmake
+++ b/environments/opteesp/component.cmake
@@ -12,7 +12,12 @@
 	endif()
 endforeach()
 
-ts_add_uuid_to_exe_name(TGT "${TGT}" UUID "${SP_UUID_CANON}" )
+# 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}")
+endif()
+ts_add_uuid_to_exe_name(TGT "${TGT}" UUID "${SP_BIN_UUID_CANON}" )
 
 target_sources(${TGT} PRIVATE
 	"${CMAKE_CURRENT_LIST_DIR}/optee_sp_header.c"
diff --git a/environments/sp/component.cmake b/environments/sp/component.cmake
index 2a4a502..3f3b0b4 100644
--- a/environments/sp/component.cmake
+++ b/environments/sp/component.cmake
@@ -12,7 +12,12 @@
 	endif()
 endforeach()
 
-ts_add_uuid_to_exe_name(TGT "${TGT}" UUID "${SP_UUID_CANON}" )
+# 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}")
+endif()
+ts_add_uuid_to_exe_name(TGT "${TGT}" UUID "${SP_BIN_UUID_CANON}" )
 
 target_sources(${TGT} PRIVATE
 	"${CMAKE_CURRENT_LIST_DIR}/entry.S"