diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index fb19fe3..aacd46e 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -368,12 +368,16 @@
 clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=3 ${ARM_TBB_OPTIONS} PLATFORM_TEST=tfm-testsuite \
     MEASURED_BOOT=1 QCBOR_DIR=$(pwd)/qcbor TF_M_TESTS_PATH=$(pwd)/../tf-m-tests TF_M_EXTRAS_PATH=$(pwd)/../tf-m-extras
 clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=4 ${ARM_TBB_OPTIONS} \
-    PLAT_MHU_VERSION=3
-clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=4 ${ARM_TBB_OPTIONS} PLATFORM_TEST=rse-rotpk
-clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=4 ${ARM_TBB_OPTIONS} PLATFORM_TEST=rse-nv-counters
-clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=4 ${ARM_TBB_OPTIONS} PLATFORM_TEST=tfm-testsuite \
-    MEASURED_BOOT=1 QCBOR_DIR=$(pwd)/qcbor TF_M_TESTS_PATH=$(pwd)/../tf-m-tests TF_M_EXTRAS_PATH=$(pwd)/../tf-m-extras
-clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=4 ${ARM_TBB_OPTIONS} MEASURED_BOOT=1 \
+    ENABLE_STACK_PROTECTOR=strong PLAT_MHU_VERSION=3
+clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=4 ${ARM_TBB_OPTIONS} \
+    ENABLE_STACK_PROTECTOR=strong PLATFORM_TEST=rse-rotpk
+clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=4 ${ARM_TBB_OPTIONS} \
+    ENABLE_STACK_PROTECTOR=strong PLATFORM_TEST=rse-nv-counters
+clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=4 ${ARM_TBB_OPTIONS} \
+    ENABLE_STACK_PROTECTOR=strong PLATFORM_TEST=tfm-testsuite \
+    TF_M_TESTS_PATH=$(pwd)/../tf-m-tests TF_M_EXTRAS_PATH=$(pwd)/../tf-m-extras
+clean_build $(common_flags) PLAT=tc TARGET_PLATFORM=4 ${ARM_TBB_OPTIONS} \
+    ENABLE_STACK_PROTECTOR=strong MEASURED_BOOT=1 \
     DICE_PROTECTION_ENVIRONMENT=1 QCBOR_DIR=$(pwd)/qcbor
 
 #
diff --git a/tf_config/fvp-tc4-nv-ctrs b/tf_config/fvp-tc4-nv-ctrs
index 95034af..7e4ce61 100644
--- a/tf_config/fvp-tc4-nv-ctrs
+++ b/tf_config/fvp-tc4-nv-ctrs
@@ -1,3 +1,4 @@
+
 ARM_GPT_SUPPORT=1
 ARM_ROTPK_LOCATION=devel_ecdsa
 CROSS_COMPILE=aarch64-none-elf-
@@ -10,3 +11,4 @@
 TARGET_PLATFORM=4
 TRUSTED_BOARD_BOOT=1
 CSS_LOAD_SCP_IMAGES=0
+ENABLE_STACK_PROTECTOR=strong
diff --git a/tf_config/fvp-tc4-rotpk b/tf_config/fvp-tc4-rotpk
index 35a0e5b..b6219eb 100644
--- a/tf_config/fvp-tc4-rotpk
+++ b/tf_config/fvp-tc4-rotpk
@@ -10,3 +10,4 @@
 TARGET_PLATFORM=4
 TRUSTED_BOARD_BOOT=1
 CSS_LOAD_SCP_IMAGES=0
+ENABLE_STACK_PROTECTOR=strong
diff --git a/tf_config/fvp-tc4-spm b/tf_config/fvp-tc4-spm
index 82302c7..5a2da09 100644
--- a/tf_config/fvp-tc4-spm
+++ b/tf_config/fvp-tc4-spm
@@ -6,3 +6,4 @@
 SP_LAYOUT_FILE=${tftf_root}/build/tc/${bin_mode}/sp_layout.json
 TARGET_PLATFORM=4
 CSS_LOAD_SCP_IMAGES=0
+ENABLE_STACK_PROTECTOR=strong
diff --git a/tf_config/fvp-tc4-tbb b/tf_config/fvp-tc4-tbb
index d90d0e7..85dee26 100644
--- a/tf_config/fvp-tc4-tbb
+++ b/tf_config/fvp-tc4-tbb
@@ -9,3 +9,4 @@
 TARGET_PLATFORM=4
 TRUSTED_BOARD_BOOT=1
 CSS_LOAD_SCP_IMAGES=0
+ENABLE_STACK_PROTECTOR=strong
diff --git a/tf_config/fvp-tc4-tbb-dpe b/tf_config/fvp-tc4-tbb-dpe
index 1435e98..265f9fe 100644
--- a/tf_config/fvp-tc4-tbb-dpe
+++ b/tf_config/fvp-tc4-tbb-dpe
@@ -11,3 +11,4 @@
 TARGET_PLATFORM=4
 TRUSTED_BOARD_BOOT=1
 CSS_LOAD_SCP_IMAGES=0
+ENABLE_STACK_PROTECTOR=strong