diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index ef51e73..072d364 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -216,7 +216,7 @@
     # nxp/lpcxpresso55s69 have to turn off BL2 when build regression test
     ("nxp/lpcxpresso55s69", "*", "*", "*", "True", "*", "*",  "*", "True", "*", "*", "*", "*"),
     # NSID does not support multi core
-    ("cypress/psoc64", "*", "*", "*", "*", "*", "*",  "*", "*", "*", "*", "*", "OFF"),
+    ("cypress/psoc64", "*", "*", "*", "*", "*", "*",  "*", "*", "*", "*", "*", "ON"),
     ]
 
 # Configure build manager to build several combinations
@@ -351,13 +351,13 @@
                 "toolchain_file":   ["toolchain_GNUARM.cmake",
                                      "toolchain_ARMCLANG.cmake"],
                 "lib_model":        [False],
-                "isolation_level":  ["1", "2", "3"],
+                "isolation_level":  ["1", "2"],
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
                 "with_otp":         ["off"],
                 "with_bl2":         [False],
-                "with_ns":          [True, False],
+                "with_ns":          [True],
                 "profile":          [""],
                 "partition_ps":     ["ON"],
                 "nsce":             ["OFF"],
@@ -736,9 +736,8 @@
 config_nightly = {"seed_params": {
                "tfm_platform":      ["arm/mps2/an521", "arm/mps2/an519",
                                      "arm/musca_b1/sse_200", "arm/musca_s1",
-                                     "arm/mps3/an524", "cypress/psoc64",
-                                     "arm/musca_b1/secure_enclave",
-                                     "stm/stm32l562e_dk"],
+                                     "arm/mps3/an524", "stm/stm32l562e_dk",
+                                     "arm/musca_b1/secure_enclave"],
                 "toolchain_file":   ["toolchain_GNUARM.cmake",
                                      "toolchain_ARMCLANG.cmake"],
                 "lib_model":        [True, False],
@@ -887,6 +886,26 @@
                 "invalid": _common_tfm_invalid_configs + []
                 }
 
+config_nightly_psoc64 = {"seed_params": {
+                "tfm_platform":     ["cypress/psoc64"],
+                "toolchain_file":   ["toolchain_GNUARM.cmake",
+                                     "toolchain_ARMCLANG.cmake"],
+                "lib_model":        [False],
+                "isolation_level":  ["1", "2"],
+                "test_regression":  [True],
+                "test_psa_api":     ["OFF"],
+                "cmake_build_type": ["Release"],
+                "with_otp":         ["off"],
+                "with_bl2":         [False],
+                "with_ns":          [True],
+                "profile":          [""],
+                "partition_ps":     ["ON"],
+                "nsce":             ["OFF"],
+                },
+                "common_params": _common_tfm_builder_cfg,
+                "invalid": _common_tfm_invalid_configs + []
+                }
+
 config_nightly_STM32L562E_DK = {"seed_params": {
                 "tfm_platform":     ["stm/stm32l562e_dk"],
                 "toolchain_file":   ["toolchain_GNUARM.cmake",
@@ -1061,13 +1080,13 @@
                 "tfm_platform":     ["cypress/psoc64"],
                 "toolchain_file":   ["toolchain_GNUARM.cmake"],
                 "lib_model":        [False],
-                "isolation_level":  ["1", "2"],
+                "isolation_level":  ["2"],
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
                 "with_otp":         ["off"],
                 "with_bl2":         [False],
-                "with_ns":          [True, False],
+                "with_ns":          [True],
                 "profile":          [""],
                 "partition_ps":     ["ON"],
                 "nsce":             ["OFF"],
@@ -1219,6 +1238,7 @@
                     "nightly_psa_api": config_nightly_PSA_API,
                     "nightly_ff": config_nightly_PSA_FF,
                     "nightly_otp": config_nightly_OTP,
+                    "nightly_psoc64": config_nightly_psoc64,
                     "nightly_stm32l562e_dk": config_nightly_STM32L562E_DK,
                     "nightly_lpcxpresso55s69": config_nightly_LPCXPRESSO55S69,