diff --git a/platform/ext/target/mps2/an519/armclang/mps2_an519_s.sct b/platform/ext/target/mps2/an519/armclang/mps2_an519_s.sct
index 4926478..420c863 100644
--- a/platform/ext/target/mps2/an519/armclang/mps2_an519_s.sct
+++ b/platform/ext/target/mps2/an519/armclang/mps2_an519_s.sct
@@ -178,14 +178,14 @@
         tfm_ss_core_test.o (+RW +ZI)
     }
 
-    TFM_SP_CORE_TEST_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_CORE_TEST_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 
     TFM_SP_CORE_TEST_2_DATA +0 ALIGN 32 {
         tfm_ss_core_test_2.o (+RW +ZI)
     }
 
-    TFM_SP_CORE_TEST_2_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_CORE_TEST_2_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 #endif /* TFM_PARTITION_TEST_CORE */
 
@@ -194,7 +194,7 @@
         sst_test_service.o (+RW +ZI)
     }
 
-    TFM_SP_SST_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_SST_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 #endif /* TFM_PARTITION_TEST_SST */
 
@@ -208,7 +208,7 @@
         *secure_suites.* (+RW +ZI)
     }
 
-    TFM_SP_SECURE_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_SECURE_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x1000 {
     }
 #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
 
diff --git a/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld b/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld
index f043346..bc4717f 100644
--- a/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld
+++ b/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld
@@ -553,7 +553,7 @@
 
     .TFM_SP_CORE_TEST_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_CORE_TEST_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_STACK);
     Image$$TFM_SP_CORE_TEST_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_STACK) + SIZEOF(.TFM_SP_CORE_TEST_STACK);
@@ -579,7 +579,7 @@
 
     .TFM_SP_CORE_TEST_2_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_CORE_TEST_2_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_2_STACK);
     Image$$TFM_SP_CORE_TEST_2_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_2_STACK) + SIZEOF(.TFM_SP_CORE_TEST_2_STACK);
@@ -605,7 +605,7 @@
 
     .TFM_SP_SST_TEST_PARTITION_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_SST_TEST_PARTITION_STACK$$ZI$$Base = ADDR(.TFM_SP_SST_TEST_PARTITION_STACK);
     Image$$TFM_SP_SST_TEST_PARTITION_STACK$$ZI$$Limit = ADDR(.TFM_SP_SST_TEST_PARTITION_STACK) + SIZEOF(.TFM_SP_SST_TEST_PARTITION_STACK);
@@ -649,7 +649,7 @@
 
     .TFM_SP_SECURE_TEST_PARTITION_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x1000;
     } > RAM AT> FLASH
     Image$$TFM_SP_SECURE_TEST_PARTITION_STACK$$ZI$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK);
     Image$$TFM_SP_SECURE_TEST_PARTITION_STACK$$ZI$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_STACK);
diff --git a/platform/ext/target/mps2/an521/armclang/mps2_an521_s.sct b/platform/ext/target/mps2/an521/armclang/mps2_an521_s.sct
index 4926478..420c863 100644
--- a/platform/ext/target/mps2/an521/armclang/mps2_an521_s.sct
+++ b/platform/ext/target/mps2/an521/armclang/mps2_an521_s.sct
@@ -178,14 +178,14 @@
         tfm_ss_core_test.o (+RW +ZI)
     }
 
-    TFM_SP_CORE_TEST_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_CORE_TEST_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 
     TFM_SP_CORE_TEST_2_DATA +0 ALIGN 32 {
         tfm_ss_core_test_2.o (+RW +ZI)
     }
 
-    TFM_SP_CORE_TEST_2_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_CORE_TEST_2_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 #endif /* TFM_PARTITION_TEST_CORE */
 
@@ -194,7 +194,7 @@
         sst_test_service.o (+RW +ZI)
     }
 
-    TFM_SP_SST_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_SST_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 #endif /* TFM_PARTITION_TEST_SST */
 
@@ -208,7 +208,7 @@
         *secure_suites.* (+RW +ZI)
     }
 
-    TFM_SP_SECURE_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_SECURE_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x1000 {
     }
 #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
 
diff --git a/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld b/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld
index e2cb090..456db25 100644
--- a/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld
+++ b/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld
@@ -553,7 +553,7 @@
 
     .TFM_SP_CORE_TEST_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_CORE_TEST_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_STACK);
     Image$$TFM_SP_CORE_TEST_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_STACK) + SIZEOF(.TFM_SP_CORE_TEST_STACK);
@@ -579,7 +579,7 @@
 
     .TFM_SP_CORE_TEST_2_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_CORE_TEST_2_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_2_STACK);
     Image$$TFM_SP_CORE_TEST_2_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_2_STACK) + SIZEOF(.TFM_SP_CORE_TEST_2_STACK);
@@ -605,7 +605,7 @@
 
     .TFM_SP_SST_TEST_PARTITION_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_SST_TEST_PARTITION_STACK$$ZI$$Base = ADDR(.TFM_SP_SST_TEST_PARTITION_STACK);
     Image$$TFM_SP_SST_TEST_PARTITION_STACK$$ZI$$Limit = ADDR(.TFM_SP_SST_TEST_PARTITION_STACK) + SIZEOF(.TFM_SP_SST_TEST_PARTITION_STACK);
@@ -649,7 +649,7 @@
 
     .TFM_SP_SECURE_TEST_PARTITION_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x1000;
     } > RAM AT> FLASH
     Image$$TFM_SP_SECURE_TEST_PARTITION_STACK$$ZI$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK);
     Image$$TFM_SP_SECURE_TEST_PARTITION_STACK$$ZI$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_STACK);
diff --git a/platform/ext/target/musca_a/Device/Source/armclang/musca_s.sct b/platform/ext/target/musca_a/Device/Source/armclang/musca_s.sct
index a1c8ea8..215efdc 100755
--- a/platform/ext/target/musca_a/Device/Source/armclang/musca_s.sct
+++ b/platform/ext/target/musca_a/Device/Source/armclang/musca_s.sct
@@ -178,14 +178,14 @@
         tfm_ss_core_test.o (+RW +ZI)
     }
 
-    TFM_SP_CORE_TEST_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_CORE_TEST_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 
     TFM_SP_CORE_TEST_2_DATA +0 ALIGN 32 {
         tfm_ss_core_test_2.o (+RW +ZI)
     }
 
-    TFM_SP_CORE_TEST_2_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_CORE_TEST_2_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 #endif /* TFM_PARTITION_TEST_CORE */
 
@@ -194,7 +194,7 @@
         sst_test_service.o (+RW +ZI)
     }
 
-    TFM_SP_SST_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_SST_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 #endif /* TFM_PARTITION_TEST_SST */
 
@@ -208,7 +208,7 @@
         *secure_suites.* (+RW +ZI)
     }
 
-    TFM_SP_SECURE_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_SECURE_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x1000 {
     }
 #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
 
diff --git a/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld b/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld
index f043346..bc4717f 100644
--- a/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld
+++ b/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld
@@ -553,7 +553,7 @@
 
     .TFM_SP_CORE_TEST_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_CORE_TEST_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_STACK);
     Image$$TFM_SP_CORE_TEST_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_STACK) + SIZEOF(.TFM_SP_CORE_TEST_STACK);
@@ -579,7 +579,7 @@
 
     .TFM_SP_CORE_TEST_2_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_CORE_TEST_2_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_2_STACK);
     Image$$TFM_SP_CORE_TEST_2_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_2_STACK) + SIZEOF(.TFM_SP_CORE_TEST_2_STACK);
@@ -605,7 +605,7 @@
 
     .TFM_SP_SST_TEST_PARTITION_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_SST_TEST_PARTITION_STACK$$ZI$$Base = ADDR(.TFM_SP_SST_TEST_PARTITION_STACK);
     Image$$TFM_SP_SST_TEST_PARTITION_STACK$$ZI$$Limit = ADDR(.TFM_SP_SST_TEST_PARTITION_STACK) + SIZEOF(.TFM_SP_SST_TEST_PARTITION_STACK);
@@ -649,7 +649,7 @@
 
     .TFM_SP_SECURE_TEST_PARTITION_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x1000;
     } > RAM AT> FLASH
     Image$$TFM_SP_SECURE_TEST_PARTITION_STACK$$ZI$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK);
     Image$$TFM_SP_SECURE_TEST_PARTITION_STACK$$ZI$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_STACK);
diff --git a/platform/ext/target/musca_b1/Device/Source/armclang/musca_s.sct b/platform/ext/target/musca_b1/Device/Source/armclang/musca_s.sct
index d62569a..e28f166 100644
--- a/platform/ext/target/musca_b1/Device/Source/armclang/musca_s.sct
+++ b/platform/ext/target/musca_b1/Device/Source/armclang/musca_s.sct
@@ -178,14 +178,14 @@
         tfm_ss_core_test.o (+RW +ZI)
     }
 
-    TFM_SP_CORE_TEST_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_CORE_TEST_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 
     TFM_SP_CORE_TEST_2_DATA +0 ALIGN 32 {
         tfm_ss_core_test_2.o (+RW +ZI)
     }
 
-    TFM_SP_CORE_TEST_2_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_CORE_TEST_2_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 #endif /* TFM_PARTITION_TEST_CORE */
 
@@ -194,7 +194,7 @@
         sst_test_service.o (+RW +ZI)
     }
 
-    TFM_SP_SST_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_SST_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x400 {
     }
 #endif /* TFM_PARTITION_TEST_SST */
 
@@ -208,7 +208,7 @@
         *secure_suites.* (+RW +ZI)
     }
 
-    TFM_SP_SECURE_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x2000 {
+    TFM_SP_SECURE_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x1000 {
     }
 #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
 
diff --git a/platform/ext/target/musca_b1/Device/Source/gcc/musca_s.ld b/platform/ext/target/musca_b1/Device/Source/gcc/musca_s.ld
index 389ff62..db44652 100644
--- a/platform/ext/target/musca_b1/Device/Source/gcc/musca_s.ld
+++ b/platform/ext/target/musca_b1/Device/Source/gcc/musca_s.ld
@@ -553,7 +553,7 @@
 
     .TFM_SP_CORE_TEST_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_CORE_TEST_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_STACK);
     Image$$TFM_SP_CORE_TEST_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_STACK) + SIZEOF(.TFM_SP_CORE_TEST_STACK);
@@ -579,7 +579,7 @@
 
     .TFM_SP_CORE_TEST_2_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_CORE_TEST_2_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_2_STACK);
     Image$$TFM_SP_CORE_TEST_2_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_2_STACK) + SIZEOF(.TFM_SP_CORE_TEST_2_STACK);
@@ -605,7 +605,7 @@
 
     .TFM_SP_SST_TEST_PARTITION_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x0400;
     } > RAM AT> FLASH
     Image$$TFM_SP_SST_TEST_PARTITION_STACK$$ZI$$Base = ADDR(.TFM_SP_SST_TEST_PARTITION_STACK);
     Image$$TFM_SP_SST_TEST_PARTITION_STACK$$ZI$$Limit = ADDR(.TFM_SP_SST_TEST_PARTITION_STACK) + SIZEOF(.TFM_SP_SST_TEST_PARTITION_STACK);
@@ -649,7 +649,7 @@
 
     .TFM_SP_SECURE_TEST_PARTITION_STACK : ALIGN(128)
     {
-        . += 0x2000;
+        . += 0x1000;
     } > RAM AT> FLASH
     Image$$TFM_SP_SECURE_TEST_PARTITION_STACK$$ZI$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK);
     Image$$TFM_SP_SECURE_TEST_PARTITION_STACK$$ZI$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_STACK);
diff --git a/test/test_services/tfm_core_test/manifest.yaml b/test/test_services/tfm_core_test/manifest.yaml
index ef02570..076b650 100644
--- a/test/test_services/tfm_core_test/manifest.yaml
+++ b/test/test_services/tfm_core_test/manifest.yaml
@@ -12,7 +12,7 @@
   "priority": "NORMAL",
   "id": "0x00000002",
   "entry_point": "main",
-  "stack_size": "0x2000",
+  "stack_size": "0x0400",
   "heap_size": "0x0400",
   "mmio_regions": [
     {
diff --git a/test/test_services/tfm_core_test_2/manifest.yaml b/test/test_services/tfm_core_test_2/manifest.yaml
index 8cf94c1..77cc5db 100644
--- a/test/test_services/tfm_core_test_2/manifest.yaml
+++ b/test/test_services/tfm_core_test_2/manifest.yaml
@@ -12,7 +12,7 @@
   "priority": "NORMAL",
   "id": "0x00000003",
   "entry_point": "main",
-  "stack_size": "0x2000",
+  "stack_size": "0x0400",
   "heap_size": "0x0400",
   "tfm_init_symbol": "core_test_2_init",
   "secure_functions": [
diff --git a/test/test_services/tfm_secure_client_service/manifest.yaml b/test/test_services/tfm_secure_client_service/manifest.yaml
index b772232..7833eba 100644
--- a/test/test_services/tfm_secure_client_service/manifest.yaml
+++ b/test/test_services/tfm_secure_client_service/manifest.yaml
@@ -13,7 +13,7 @@
   "priority": "NORMAL",
   "id": "0x00000005",
   "entry_point": "main",
-  "stack_size": "0x2000",
+  "stack_size": "0x1000",
   "heap_size": "0x0400",
   "mmio_regions": [
     {
diff --git a/test/test_services/tfm_sst_test_service/manifest.yaml b/test/test_services/tfm_sst_test_service/manifest.yaml
index d75a51e..e6b26b0 100644
--- a/test/test_services/tfm_sst_test_service/manifest.yaml
+++ b/test/test_services/tfm_sst_test_service/manifest.yaml
@@ -13,7 +13,7 @@
   "priority": "NORMAL",
   "id": "0x00000004",
   "entry_point": "main",
-  "stack_size": "0x2000",
+  "stack_size": "0x0400",
   "heap_size": "0x0400",
   "tfm_init_symbol": "sst_test_service_init",
   "secure_functions": [