diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index be4f767..3f18400 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -96,7 +96,7 @@
     "TEST_CBOR"    : "-DTEST_NS_QCBOR=ON ",
 
     # Profiling test
-    "PROF"         : "-DCONFIG_TFM_ENALBE_PROFILING=ON -DTFM_TOOLS_PATH=%(codebase_root_dir)s/../tf-m-tools ",
+    "PROF"         : ("-DTFM_EXTRA_CONFIG_PATH=%(codebase_root_dir)s/../tf-m-tools/profiling/profiling_cases/prof_psa_client_api/partitions/config_spe.cmake "),
 
     # tf-m-extras example support
     "EXAMPLE_VAD"             : ("-DNS_EVALUATION_APP_PATH=%(codebase_root_dir)s/../tf-m-extras/examples/vad_an552/ns_side "
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 0c44808..1eafdfb 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -46,7 +46,7 @@
     # provided in the seed dictionary.
 
     "spe_config_template": "cmake -G Ninja " + \
-        "-S %(tfm_tests_root_dir)s/%(test_root_dir)s/spe " + \
+        "-S %(spe_root_dir)s " + \
         "-B %(ci_build_root_dir)s/spe " + \
         "-DTFM_PLATFORM=%(tfm_platform)s " + \
         "-DTFM_TOOLCHAIN_FILE=%(codebase_root_dir)s/%(s_compiler)s " + \
@@ -65,7 +65,7 @@
         "-DTFM_EXTRAS_REPO_PATH=%(codebase_root_dir)s/../tf-m-extras ",
 
     "nspe_config_template": "cmake -G Ninja " + \
-        "-S %(tfm_tests_root_dir)s/%(test_root_dir)s " + \
+        "-S %(nspe_root_dir)s " + \
         "-B %(ci_build_root_dir)s/nspe " + \
         "-DCONFIG_SPE_PATH=%(ci_build_root_dir)s/spe/api_ns " + \
         "-DTFM_TOOLCHAIN_FILE=%(ci_build_root_dir)s/spe/api_ns/cmake/%(ns_compiler)s " + \