diff --git a/deployments/attestation/opteesp/CMakeLists.txt b/deployments/attestation/opteesp/CMakeLists.txt
index 8d6ae67..92508eb 100644
--- a/deployments/attestation/opteesp/CMakeLists.txt
+++ b/deployments/attestation/opteesp/CMakeLists.txt
@@ -5,6 +5,9 @@
 #
 #-------------------------------------------------------------------------------
 cmake_minimum_required(VERSION 3.16)
+
+# Set default platform.
+set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Target platform location.")
 include(../../deployment.cmake REQUIRED)
 
 #-------------------------------------------------------------------------------
@@ -81,14 +84,9 @@
 )
 
 #-------------------------------------------------------------------------------
-#  Use the selected platform to provide drivers needed by the deployment
+#  Set target platform to provide drivers needed by the deployment
 #
 #-------------------------------------------------------------------------------
-# temporarily force platform - with this change, the build interface to
-# an external builder such as a Yocto recipe is unchanged.  Should remove
-# once the build interface is published.
-set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Overridden" FORCE)
-
 add_platform(TARGET "attestation")
 
 #-------------------------------------------------------------------------------
diff --git a/deployments/crypto/opteesp/CMakeLists.txt b/deployments/crypto/opteesp/CMakeLists.txt
index 79f238b..8ada74e 100644
--- a/deployments/crypto/opteesp/CMakeLists.txt
+++ b/deployments/crypto/opteesp/CMakeLists.txt
@@ -5,6 +5,9 @@
 #
 #-------------------------------------------------------------------------------
 cmake_minimum_required(VERSION 3.16)
+
+# Set default platform.
+set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Target platform location.")
 include(../../deployment.cmake REQUIRED)
 
 #-------------------------------------------------------------------------------
@@ -78,14 +81,9 @@
 )
 
 #-------------------------------------------------------------------------------
-#  Use the selected platform to provide drivers needed by the deployment
+#  Set target platform to provide drivers needed by the deployment
 #
 #-------------------------------------------------------------------------------
-# temporarily force platform - with this change, the build interface to
-# an external builder such as a Yocto recipe is unchanged.  Should remove
-# once the build interface is published.
-set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Overridden" FORCE)
-
 add_platform(TARGET "crypto-sp")
 
 #-------------------------------------------------------------------------------
diff --git a/deployments/env-test/opteesp/CMakeLists.txt b/deployments/env-test/opteesp/CMakeLists.txt
index 1ec681b..d2c5447 100644
--- a/deployments/env-test/opteesp/CMakeLists.txt
+++ b/deployments/env-test/opteesp/CMakeLists.txt
@@ -5,6 +5,9 @@
 #
 #-------------------------------------------------------------------------------
 cmake_minimum_required(VERSION 3.16)
+
+# Set default platform.
+set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Target platform location.")
 include(../../deployment.cmake REQUIRED)
 
 #-------------------------------------------------------------------------------
@@ -58,13 +61,10 @@
 )
 
 #-------------------------------------------------------------------------------
-#  Use the selected platform to provide drivers needed by the deployment
+#  Set target platform to provide drivers needed by the deployment
 #
 #-------------------------------------------------------------------------------
-# temporarily force platform - remove when external builder updated
-set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Overridden" FORCE)
-
-add_platform(TARGET "env-test")
+add_platform(TARGET "env_test")
 
 if(CMAKE_CROSSCOMPILING)
 	target_link_libraries(env-test PRIVATE stdc++ gcc m)
diff --git a/deployments/se-proxy/opteesp/CMakeLists.txt b/deployments/se-proxy/opteesp/CMakeLists.txt
index 2fb4bcc..4e2069a 100644
--- a/deployments/se-proxy/opteesp/CMakeLists.txt
+++ b/deployments/se-proxy/opteesp/CMakeLists.txt
@@ -5,6 +5,9 @@
 #
 #-------------------------------------------------------------------------------
 cmake_minimum_required(VERSION 3.16)
+
+# Set default platform.
+set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Target platform location.")
 include(../../deployment.cmake REQUIRED)
 
 #-------------------------------------------------------------------------------
@@ -89,14 +92,9 @@
 )
 
 #-------------------------------------------------------------------------------
-#  Use the selected platform to provide drivers needed by the deployment
+#  Set target platform to provide drivers needed by the deployment
 #
 #-------------------------------------------------------------------------------
-# temporarily force platform - with this change, the build interface to
-# an external builder such as a Yocto recipe is unchanged.  Should remove
-# once the build interface is published.
-set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Overridden" FORCE)
-
 add_platform(TARGET "se-proxy")
 
 #-------------------------------------------------------------------------------
diff --git a/deployments/smm-gateway/opteesp/CMakeLists.txt b/deployments/smm-gateway/opteesp/CMakeLists.txt
index 6a7f6e0..f9f9721 100644
--- a/deployments/smm-gateway/opteesp/CMakeLists.txt
+++ b/deployments/smm-gateway/opteesp/CMakeLists.txt
@@ -5,6 +5,9 @@
 #
 #-------------------------------------------------------------------------------
 cmake_minimum_required(VERSION 3.16)
+
+# Set default platform.
+set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Target platform location.")
 include(../../deployment.cmake REQUIRED)
 
 #-------------------------------------------------------------------------------
@@ -70,14 +73,9 @@
 )
 
 #-------------------------------------------------------------------------------
-#  Use the selected platform to provide drivers needed by the deployment
+#  Set target platform to provide drivers needed by the deployment
 #
 #-------------------------------------------------------------------------------
-# temporarily force platform - with this change, the build interface to
-# an external builder such as a Yocto recipe is unchanged.  Should remove
-# once the build interface is published.
-set(TS_PLATFORM "arm/fvp/fvp_base_revc-2xaemv8a" CACHE STRING "Overridden" FORCE)
-
 add_platform(TARGET "smm-gateway")
 
 #################################################################