diff --git a/deployments/attestation/opteesp/CMakeLists.txt b/deployments/attestation/opteesp/CMakeLists.txt
index c38be06..fa58a4d 100644
--- a/deployments/attestation/opteesp/CMakeLists.txt
+++ b/deployments/attestation/opteesp/CMakeLists.txt
@@ -63,23 +63,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(attestation PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
-		-O0
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(attestation PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(attestation PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-		# -Wl,--dynamic-list ${CMAKE_CURRENT_LIST_DIR}/dyn_list
-	)
 endif()
 
 compiler_generate_stripped_elf(TARGET attestation NAME "${SP_UUID_CANON}.stripped.elf" RES STRIPPED_ELF)
diff --git a/deployments/attestation/sp/CMakeLists.txt b/deployments/attestation/sp/CMakeLists.txt
index f6c94c2..08d130e 100644
--- a/deployments/attestation/sp/CMakeLists.txt
+++ b/deployments/attestation/sp/CMakeLists.txt
@@ -59,21 +59,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(attestation PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(attestation PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(attestation PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-	)
 endif()
 
 compiler_generate_binary_output(TARGET attestation NAME "${SP_UUID_CANON}.bin" SP_BINARY)
diff --git a/deployments/component-test/arm-linux/CMakeLists.txt b/deployments/component-test/arm-linux/CMakeLists.txt
index b30b160..f104dd6 100644
--- a/deployments/component-test/arm-linux/CMakeLists.txt
+++ b/deployments/component-test/arm-linux/CMakeLists.txt
@@ -50,5 +50,4 @@
 #  Define library options and dependencies.
 #
 #-------------------------------------------------------------------------------
-env_set_link_options(TGT component-test)
 target_link_libraries(component-test PRIVATE stdc++ gcc m)
diff --git a/deployments/crypto/opteesp/CMakeLists.txt b/deployments/crypto/opteesp/CMakeLists.txt
index 9f6453a..6909fd5 100644
--- a/deployments/crypto/opteesp/CMakeLists.txt
+++ b/deployments/crypto/opteesp/CMakeLists.txt
@@ -8,6 +8,13 @@
 
 # Set default platform.
 set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Target platform location.")
+
+# Te crypto SP is big. Set default build type to MinSizWithDebInfo to avoid running ouf of
+# secure memory on low resource IoT platforms.
+if (NOT DEFINED CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "MinSizWithDebInfo" CACHE STRING "Build type.")
+endif()
+
 include(../../deployment.cmake REQUIRED)
 
 #-------------------------------------------------------------------------------
@@ -59,23 +66,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(crypto PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
-		-Os
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(crypto PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(crypto PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-		# -Wl,--dynamic-list ${CMAKE_CURRENT_LIST_DIR}/dyn_list
-	)
 endif()
 
 compiler_generate_stripped_elf(TARGET crypto NAME "${SP_UUID_CANON}.stripped.elf" RES STRIPPED_ELF)
diff --git a/deployments/crypto/sp/CMakeLists.txt b/deployments/crypto/sp/CMakeLists.txt
index c4f85df..943b9a6 100644
--- a/deployments/crypto/sp/CMakeLists.txt
+++ b/deployments/crypto/sp/CMakeLists.txt
@@ -8,6 +8,13 @@
 
 # Set default platform.
 set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Target platform location.")
+
+# Te crypto SP is big. Set default build type to MinSizWithDebInfo  to avoid running ouf of
+# secure memory on low resource IoT platforms.
+if (NOT DEFINED CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "MinSizWithDebInfo" CACHE STRING "Build type.")
+endif()
+
 include(../../deployment.cmake REQUIRED)
 
 #-------------------------------------------------------------------------------
@@ -55,21 +62,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(crypto PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(crypto PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(crypto PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-	)
 endif()
 
 compiler_generate_binary_output(TARGET crypto NAME "${SP_UUID_CANON}.bin" SP_BINARY)
diff --git a/deployments/deployment.cmake b/deployments/deployment.cmake
index e1aaed0..3e13a54 100644
--- a/deployments/deployment.cmake
+++ b/deployments/deployment.cmake
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -55,4 +55,22 @@
 define_property(TARGET PROPERTY TS_PLATFORM_DRIVER_DEPENDENCIES
   BRIEF_DOCS "List of platform driver interfaces used for a deployment."
   FULL_DOCS "Used by the platform specific builder to specify a configuration for the built platform components."
-  )
\ No newline at end of file
+  )
+
+# Set default build type to Debug
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type.")
+endif()
+
+# List of supported build types. Needs to be in alignment with the toolchain file
+set(TS_SUPPORTED_BUILD_TYPES DEBUG "MINSIZEREL" "MINSIZWITHDEBINFO" "RELEASE" "RELWITHDEBINFO" CACHE
+  STRING "List of supported build types.")
+
+# Convert the build type string to upper case to help case insensitive comparison.
+string(TOUPPER "${CMAKE_BUILD_TYPE}" UC_CMAKE_BUILD_TYPE CACHE STRING "Easy to compare build type.")
+mark_as_advanced(UC_CMAKE_BUILD_TYPE)
+
+# Validate build type
+if (NOT "${UC_CMAKE_BUILD_TYPE}" IN_LIST TS_SUPPORTED_BUILD_TYPES)
+	message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\" specified in CMAKE_BUILD_TYPE.")
+endif()
diff --git a/deployments/env-test/opteesp/CMakeLists.txt b/deployments/env-test/opteesp/CMakeLists.txt
index 430993e..4b3a246 100644
--- a/deployments/env-test/opteesp/CMakeLists.txt
+++ b/deployments/env-test/opteesp/CMakeLists.txt
@@ -72,23 +72,7 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(env-test PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
-		-O0
-		$<$<COMPILE_LANGUAGE:C>:-std=c99>
-		$<$<COMPILE_LANGUAGE:CXX>:-fno-use-cxa-atexit>
-	)
-
-	# Options for GCC that control linking
-	target_link_options(env-test PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(env-test PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-		# -Wl,--dynamic-list ${CMAKE_CURRENT_LIST_DIR}/dyn_list
+		-std=c99
 	)
 endif()
 
diff --git a/deployments/env-test/sp/CMakeLists.txt b/deployments/env-test/sp/CMakeLists.txt
index 52de2db..99aa8f8 100644
--- a/deployments/env-test/sp/CMakeLists.txt
+++ b/deployments/env-test/sp/CMakeLists.txt
@@ -63,22 +63,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(env-test PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
-		$<$<COMPILE_LANGUAGE:C>:-std=c99>
-		$<$<COMPILE_LANGUAGE:CXX>:-fno-use-cxa-atexit>
+		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(env-test PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(env-test PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-	)
 endif()
 
 compiler_generate_binary_output(TARGET env-test NAME "${SP_UUID_CANON}.bin" SP_BINARY)
diff --git a/deployments/internal-trusted-storage/opteesp/CMakeLists.txt b/deployments/internal-trusted-storage/opteesp/CMakeLists.txt
index ba3c654..5f4b911 100644
--- a/deployments/internal-trusted-storage/opteesp/CMakeLists.txt
+++ b/deployments/internal-trusted-storage/opteesp/CMakeLists.txt
@@ -44,23 +44,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(internal-trusted-storage PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
-		-O0
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(internal-trusted-storage PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(internal-trusted-storage PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-		# -Wl,--dynamic-list ${CMAKE_CURRENT_LIST_DIR}/dyn_list
-	)
 endif()
 
 compiler_generate_stripped_elf(TARGET internal-trusted-storage NAME "${SP_UUID_CANON}.stripped.elf" RES STRIPPED_ELF)
diff --git a/deployments/internal-trusted-storage/sp/CMakeLists.txt b/deployments/internal-trusted-storage/sp/CMakeLists.txt
index d3f65c0..90a84dd 100644
--- a/deployments/internal-trusted-storage/sp/CMakeLists.txt
+++ b/deployments/internal-trusted-storage/sp/CMakeLists.txt
@@ -40,21 +40,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(internal-trusted-storage PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(internal-trusted-storage PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(internal-trusted-storage PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-	)
 endif()
 
 compiler_generate_binary_output(TARGET internal-trusted-storage NAME "${SP_UUID_CANON}.bin" SP_BINARY)
diff --git a/deployments/libsp/opteesp/CMakeLists.txt b/deployments/libsp/opteesp/CMakeLists.txt
index 8495679..fb47a60 100644
--- a/deployments/libsp/opteesp/CMakeLists.txt
+++ b/deployments/libsp/opteesp/CMakeLists.txt
@@ -63,10 +63,6 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(sp PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
-		-O0
 		-std=c99
 	)
 endif()
diff --git a/deployments/libts/arm-linux/CMakeLists.txt b/deployments/libts/arm-linux/CMakeLists.txt
index cc589ba..75ce321 100644
--- a/deployments/libts/arm-linux/CMakeLists.txt
+++ b/deployments/libts/arm-linux/CMakeLists.txt
@@ -51,5 +51,4 @@
 #  Define library options and dependencies.
 #
 #-------------------------------------------------------------------------------
-env_set_link_options(TGT ts)
 target_link_libraries(ts PRIVATE gcc)
diff --git a/deployments/platform-inspect/arm-linux/CMakeLists.txt b/deployments/platform-inspect/arm-linux/CMakeLists.txt
index b7f254a..0f41586 100644
--- a/deployments/platform-inspect/arm-linux/CMakeLists.txt
+++ b/deployments/platform-inspect/arm-linux/CMakeLists.txt
@@ -33,7 +33,6 @@
 #  Define library options and dependencies.
 #
 #-------------------------------------------------------------------------------
-env_set_link_options(TGT platform-inspect)
 target_link_libraries(platform-inspect PRIVATE stdc++ gcc m)
 
 #-------------------------------------------------------------------------------
diff --git a/deployments/protected-storage/opteesp/CMakeLists.txt b/deployments/protected-storage/opteesp/CMakeLists.txt
index a7034c0..44b7a2b 100644
--- a/deployments/protected-storage/opteesp/CMakeLists.txt
+++ b/deployments/protected-storage/opteesp/CMakeLists.txt
@@ -44,23 +44,8 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(protected-storage PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
-		-O0
 		-std=c99
 	)
-
-	# Options for GCC that control linking
-	target_link_options(protected-storage PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(protected-storage PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-		# -Wl,--dynamic-list ${CMAKE_CURRENT_LIST_DIR}/dyn_list
-	)
 endif()
 
 compiler_generate_stripped_elf(TARGET protected-storage NAME "${SP_UUID_CANON}.stripped.elf" RES STRIPPED_ELF)
diff --git a/deployments/protected-storage/sp/CMakeLists.txt b/deployments/protected-storage/sp/CMakeLists.txt
index a22b1a7..05d2a00 100644
--- a/deployments/protected-storage/sp/CMakeLists.txt
+++ b/deployments/protected-storage/sp/CMakeLists.txt
@@ -40,21 +40,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(protected-storage PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(protected-storage PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(protected-storage PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-	)
 endif()
 
 compiler_generate_binary_output(TARGET protected-storage NAME "${SP_UUID_CANON}.bin" SP_BINARY)
diff --git a/deployments/se-proxy/opteesp/CMakeLists.txt b/deployments/se-proxy/opteesp/CMakeLists.txt
index 1c6753a..fadbf72 100644
--- a/deployments/se-proxy/opteesp/CMakeLists.txt
+++ b/deployments/se-proxy/opteesp/CMakeLists.txt
@@ -59,23 +59,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(se-proxy PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
-		-O0
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(se-proxy PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(se-proxy PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-		# -Wl,--dynamic-list ${CMAKE_CURRENT_LIST_DIR}/dyn_list
-	)
 endif()
 
 compiler_generate_stripped_elf(TARGET se-proxy NAME "${SP_UUID_CANON}.stripped.elf" RES STRIPPED_ELF)
diff --git a/deployments/se-proxy/sp/CMakeLists.txt b/deployments/se-proxy/sp/CMakeLists.txt
index 314446e..ea95008 100644
--- a/deployments/se-proxy/sp/CMakeLists.txt
+++ b/deployments/se-proxy/sp/CMakeLists.txt
@@ -55,21 +55,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(se-proxy PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(se-proxy PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(se-proxy PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-	)
 endif()
 
 compiler_generate_binary_output(TARGET se-proxy NAME "${SP_UUID_CANON}.bin" SP_BINARY)
diff --git a/deployments/sfs-demo/opteesp/CMakeLists.txt b/deployments/sfs-demo/opteesp/CMakeLists.txt
index ac07e60..1dbc279 100644
--- a/deployments/sfs-demo/opteesp/CMakeLists.txt
+++ b/deployments/sfs-demo/opteesp/CMakeLists.txt
@@ -43,23 +43,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(sfs-demo PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
-		-O0
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(sfs-demo PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(sfs-demo PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-		# -Wl,--dynamic-list ${CMAKE_CURRENT_LIST_DIR}/dyn_list
-	)
 endif()
 
 compiler_generate_stripped_elf(TARGET sfs-demo NAME "${SP_UUID_CANON}.stripped.elf" RES STRIPPED_ELF)
diff --git a/deployments/sfs-demo/sp/CMakeLists.txt b/deployments/sfs-demo/sp/CMakeLists.txt
index 5c0d098..6e24288 100644
--- a/deployments/sfs-demo/sp/CMakeLists.txt
+++ b/deployments/sfs-demo/sp/CMakeLists.txt
@@ -40,21 +40,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(sfs-demo PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(sfs-demo PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(sfs-demo PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-	)
 endif()
 
 compiler_generate_binary_output(TARGET sfs-demo NAME "${SP_UUID_CANON}.bin" SP_BINARY)
diff --git a/deployments/smm-gateway/opteesp/CMakeLists.txt b/deployments/smm-gateway/opteesp/CMakeLists.txt
index 8a277cd..ac7369f 100644
--- a/deployments/smm-gateway/opteesp/CMakeLists.txt
+++ b/deployments/smm-gateway/opteesp/CMakeLists.txt
@@ -63,23 +63,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(smm-gateway PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
-		-O0
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(smm-gateway PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(smm-gateway PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-		# -Wl,--dynamic-list ${CMAKE_CURRENT_LIST_DIR}/dyn_list
-	)
 endif()
 
 compiler_generate_stripped_elf(TARGET smm-gateway NAME "${SP_UUID_CANON}.stripped.elf" RES STRIPPED_ELF)
diff --git a/deployments/smm-gateway/sp/CMakeLists.txt b/deployments/smm-gateway/sp/CMakeLists.txt
index ea63444..38db310 100644
--- a/deployments/smm-gateway/sp/CMakeLists.txt
+++ b/deployments/smm-gateway/sp/CMakeLists.txt
@@ -59,21 +59,9 @@
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(smm-gateway PRIVATE
-		-fdiagnostics-show-option
-		-gdwarf-2
-		-mstrict-align
 		-std=c99
 	)
 
-	# Options for GCC that control linking
-	target_link_options(smm-gateway PRIVATE
-		-zmax-page-size=4096
-	)
-	# Options directly for LD, these are not understood by GCC
-	target_link_options(smm-gateway PRIVATE
-		-Wl,--as-needed
-		-Wl,--sort-section=alignment
-	)
 endif()
 
 compiler_generate_binary_output(TARGET smm-gateway NAME "${SP_UUID_CANON}.bin" SP_BINARY)
diff --git a/deployments/ts-demo/arm-linux/CMakeLists.txt b/deployments/ts-demo/arm-linux/CMakeLists.txt
index 0e20148..db59599 100644
--- a/deployments/ts-demo/arm-linux/CMakeLists.txt
+++ b/deployments/ts-demo/arm-linux/CMakeLists.txt
@@ -29,5 +29,4 @@
 #  Define library options and dependencies.
 #
 #-------------------------------------------------------------------------------
-env_set_link_options(TGT ts-demo)
 target_link_libraries(ts-demo PRIVATE stdc++ gcc m)
diff --git a/deployments/ts-remote-test/arm-linux/CMakeLists.txt b/deployments/ts-remote-test/arm-linux/CMakeLists.txt
index 831246e..a44cb4c 100644
--- a/deployments/ts-remote-test/arm-linux/CMakeLists.txt
+++ b/deployments/ts-remote-test/arm-linux/CMakeLists.txt
@@ -27,5 +27,4 @@
 #  Define library options and dependencies.
 #
 #-------------------------------------------------------------------------------
-env_set_link_options(TGT ts-remote-test)
 target_link_libraries(ts-remote-test PRIVATE stdc++ gcc m)
diff --git a/deployments/ts-service-test/arm-linux/CMakeLists.txt b/deployments/ts-service-test/arm-linux/CMakeLists.txt
index 67388ce..6eef67d 100644
--- a/deployments/ts-service-test/arm-linux/CMakeLists.txt
+++ b/deployments/ts-service-test/arm-linux/CMakeLists.txt
@@ -39,5 +39,4 @@
 #  Define library options and dependencies.
 #
 #-------------------------------------------------------------------------------
-env_set_link_options(TGT ts-service-test)
 target_link_libraries(ts-service-test PRIVATE stdc++ gcc m)
diff --git a/deployments/uefi-test/arm-linux/CMakeLists.txt b/deployments/uefi-test/arm-linux/CMakeLists.txt
index e94a61a..c555b3a 100644
--- a/deployments/uefi-test/arm-linux/CMakeLists.txt
+++ b/deployments/uefi-test/arm-linux/CMakeLists.txt
@@ -39,5 +39,4 @@
 #  Define library options and dependencies.
 #
 #-------------------------------------------------------------------------------
-env_set_link_options(TGT uefi-test)
 target_link_libraries(uefi-test PRIVATE stdc++ gcc m)