diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 9261ea0..ee43e2a 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -416,10 +416,9 @@
         elif "PROF" in i.extra_params:
             overwrite_params["spe_root_dir"] = build_cfg["codebase_root_dir"] + "/../tf-m-tests/tests_reg/spe"
             overwrite_params["nspe_root_dir"] = build_cfg["codebase_root_dir"] + "/../tf-m-tests/tests_reg"
-        elif any("EXTRAS_" in param for param in i.extra_params):
-            path_name = [param for param in extra_params if "EXTRAS_" in param][0]
+        elif "EXTRAS_" in i.extra_params:
             overwrite_params["spe_root_dir"] = build_cfg["codebase_root_dir"]
-            overwrite_params["nspe_root_dir"] = build_cfg["codebase_root_dir"] + "/../tf-m-extras/" + mapTfmExtrasExamplePaths[path_name]
+            overwrite_params["nspe_root_dir"] = build_cfg["codebase_root_dir"] + "/../tf-m-extras/" + mapTfmExtrasExamplePaths[i.extra_params]
 
         # Overwrite commands for building TF-M image
         build_cfg["spe_config_template"] %= overwrite_params