diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 276adc6..a1954fc 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -49,7 +49,7 @@
         "-S %(tfm_tests_root_dir)s/%(test_root_dir)s/spe " + \
         "-B %(ci_build_root_dir)s/spe " + \
         "-DTFM_PLATFORM=%(tfm_platform)s " + \
-        "-DTFM_TOOLCHAIN_FILE=%(codebase_root_dir)s/%(compiler)s " + \
+        "-DTFM_TOOLCHAIN_FILE=%(codebase_root_dir)s/%(s_compiler)s " + \
         "-DTFM_ISOLATION_LEVEL=%(isolation_level)s " + \
         "%(test_regression)s " + \
         "-DCMAKE_BUILD_TYPE=%(cmake_build_type)s " + \
@@ -68,6 +68,7 @@
         "-S %(tfm_tests_root_dir)s/%(test_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 " + \
         "%(extra_params)s " + \
         "-DQCBOR_PATH=%(codebase_root_dir)s/../qcbor ",
 
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index ed7cf3e..7721a8c 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -72,12 +72,18 @@
 
         super(TFM_Build_Manager, self).__init__(name="TFM_Build_Manager")
 
-    def choose_toolchain(self, compiler):
+    def choose_toolchain(self, compiler, s_build):
         toolchain = ""
-        if "GCC"in compiler:
-            toolchain = "toolchain_GNUARM.cmake"
-        elif "ARMCLANG" in compiler:
-            toolchain = "toolchain_ARMCLANG.cmake"
+        if s_build:
+            if "GCC"in compiler:
+                toolchain = "toolchain_GNUARM.cmake"
+            elif "ARMCLANG" in compiler:
+                toolchain = "toolchain_ARMCLANG.cmake"
+        else:
+            if "GCC"in compiler:
+                toolchain = "toolchain_ns_GNUARM.cmake"
+            elif "ARMCLANG" in compiler:
+                toolchain = "toolchain_ns_ARMCLANG.cmake"
 
         return toolchain
 
@@ -380,7 +386,8 @@
                             "tfm_tests_root_dir":  build_cfg["codebase_root_dir"] + "/../tf-m-tests",
                             "ci_build_root_dir":  build_cfg["codebase_root_dir"] + "/../ci_build",
                             "tfm_platform": i.tfm_platform,
-                            "compiler": self.choose_toolchain(i.compiler),
+                            "s_compiler": self.choose_toolchain(i.compiler, s_build = True),
+                            "ns_compiler": self.choose_toolchain(i.compiler, s_build = False),
                             "isolation_level": i.isolation_level,
                             "test_regression": self.map_params(i.test_regression, mapRegTest),
                             "test_psa_api": i.test_psa_api,