diff --git a/tools/cmake/cores/Cortex-M23-NS.cmake b/tools/cmake/cores/Cortex-M23-NS.cmake
index b3ff18a4cd..c71f582ffc 100644
--- a/tools/cmake/cores/Cortex-M23-NS.cmake
+++ b/tools/cmake/cores/Cortex-M23-NS.cmake
@@ -19,6 +19,7 @@ function(mbed_set_cpu_core_definitions target)
         INTERFACE
             __CORTEX_M23
             ARM_MATH_ARMV8MBL
+            DOMAIN_NS=1
             __CMSIS_RTOS
             __MBED_CMSIS_RTOS_CM
     )
diff --git a/tools/cmake/cores/Cortex-M23.cmake b/tools/cmake/cores/Cortex-M23.cmake
index c71f582ffc..b3ff18a4cd 100644
--- a/tools/cmake/cores/Cortex-M23.cmake
+++ b/tools/cmake/cores/Cortex-M23.cmake
@@ -19,7 +19,6 @@ function(mbed_set_cpu_core_definitions target)
         INTERFACE
             __CORTEX_M23
             ARM_MATH_ARMV8MBL
-            DOMAIN_NS=1
             __CMSIS_RTOS
             __MBED_CMSIS_RTOS_CM
     )
diff --git a/tools/cmake/cores/Cortex-M33-NS.cmake b/tools/cmake/cores/Cortex-M33-NS.cmake
index 6bbec855c2..2de394aa17 100644
--- a/tools/cmake/cores/Cortex-M33-NS.cmake
+++ b/tools/cmake/cores/Cortex-M33-NS.cmake
@@ -20,6 +20,7 @@ function(mbed_set_cpu_core_definitions target)
         INTERFACE
             __CORTEX_M33
             ARM_MATH_ARMV8MML
+            DOMAIN_NS=1
             __CMSIS_RTOS
             __MBED_CMSIS_RTOS_CM
     )
diff --git a/tools/cmake/cores/Cortex-M33.cmake b/tools/cmake/cores/Cortex-M33.cmake
index 2de394aa17..6bbec855c2 100644
--- a/tools/cmake/cores/Cortex-M33.cmake
+++ b/tools/cmake/cores/Cortex-M33.cmake
@@ -20,7 +20,6 @@ function(mbed_set_cpu_core_definitions target)
         INTERFACE
             __CORTEX_M33
             ARM_MATH_ARMV8MML
-            DOMAIN_NS=1
             __CMSIS_RTOS
             __MBED_CMSIS_RTOS_CM
     )
diff --git a/tools/cmake/cores/Cortex-M33F-NS.cmake b/tools/cmake/cores/Cortex-M33F-NS.cmake
index 8dd83c089e..f070591c2a 100644
--- a/tools/cmake/cores/Cortex-M33F-NS.cmake
+++ b/tools/cmake/cores/Cortex-M33F-NS.cmake
@@ -23,6 +23,7 @@ function(mbed_set_cpu_core_definitions target)
         INTERFACE
             __CORTEX_M33
             ARM_MATH_ARMV8MML
+            DOMAIN_NS=1
             __FPU_PRESENT=1U
             __CMSIS_RTOS
             __MBED_CMSIS_RTOS_CM
diff --git a/tools/cmake/cores/Cortex-M33F.cmake b/tools/cmake/cores/Cortex-M33F.cmake
index b54f26f3ba..38c0ecb8fd 100644
--- a/tools/cmake/cores/Cortex-M33F.cmake
+++ b/tools/cmake/cores/Cortex-M33F.cmake
@@ -22,7 +22,6 @@ function(mbed_set_cpu_core_definitions target)
         INTERFACE
             __CORTEX_M33
             ARM_MATH_ARMV8MML
-            DOMAIN_NS=1
             __FPU_PRESENT=1U
             __CMSIS_RTOS
             __MBED_CMSIS_RTOS_CM