diff --git a/fvp_utils.sh b/fvp_utils.sh
index c87f423..ffc119c 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -25,8 +25,8 @@
 sp3_addr="${sp3_addr:-0x7200000}"
 sp4_addr="${sp4_addr:-0x7600000}"
 # SPM out directories
-export spm_secure_out_dir="${spm_secure_out_dir:-secure_aem_v8a_fvp_clang}"
-export spm_non_secure_out_dir="${spm_non_secure_out_dir:-aem_v8a_fvp_clang}"
+export spm_secure_out_dir="${spm_secure_out_dir:-secure_aem_v8a_fvp_vhe_clang}"
+export spm_non_secure_out_dir="${spm_non_secure_out_dir:-aem_v8a_fvp_vhe_clang}"
 
 ns_bl1u_addr="${ns_bl1u_addr:-0x0beb8000}"
 fwu_fip_addr="${fwu_fip_addr:-0x08400000}"
diff --git a/group/spm-l2-boot-tests/fvp-default,fvp-spm,fvp-ivy-vhe:fvp-spm b/group/spm-l2-boot-tests/fvp-default,fvp-spm,fvp-ivy-vhe:fvp-spm
index 1440abb..b8939c8 100644
--- a/group/spm-l2-boot-tests/fvp-default,fvp-spm,fvp-ivy-vhe:fvp-spm
+++ b/group/spm-l2-boot-tests/fvp-default,fvp-spm,fvp-ivy-vhe:fvp-spm
@@ -3,8 +3,3 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
-
-pre_spm_build() {
-	# Hafnium build repo containing Sercure hafnium binary build for vhe
-        out_dir="secure_aem_v8a_fvp_vhe_clang" set_spm_out_dir
-}