diff --git a/tf_config/fvp-spm b/tf_config/fvp-spm
index a0ceae5..39cd1d1 100644
--- a/tf_config/fvp-spm
+++ b/tf_config/fvp-spm
@@ -5,5 +5,6 @@
 CTX_INCLUDE_EL2_REGS=1
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
+CTX_INCLUDE_MTE_REGS=1
 BRANCH_PROTECTION=1
 SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-hyp b/tf_config/fvp-spm-hyp
index f28c804..ed57c1f 100644
--- a/tf_config/fvp-spm-hyp
+++ b/tf_config/fvp-spm-hyp
@@ -7,5 +7,6 @@
 CTX_INCLUDE_EL2_REGS=1
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
+CTX_INCLUDE_MTE_REGS=1
 BRANCH_PROTECTION=1
 SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-optee-sp b/tf_config/fvp-spm-optee-sp
index 95fc011..caed5fb 100644
--- a/tf_config/fvp-spm-optee-sp
+++ b/tf_config/fvp-spm-optee-sp
@@ -1,5 +1,6 @@
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
+CTX_INCLUDE_MTE_REGS=1
 BRANCH_PROTECTION=1
 ARM_SPMC_MANIFEST_DTS=plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts
 CROSS_COMPILE=aarch64-none-elf-
diff --git a/tf_config/fvp-spm-rme b/tf_config/fvp-spm-rme
index 8d8446d..3dbf23a 100644
--- a/tf_config/fvp-spm-rme
+++ b/tf_config/fvp-spm-rme
@@ -6,4 +6,5 @@
 SPMD_SPM_AT_SEL2=1
 BRANCH_PROTECTION=1
 CTX_INCLUDE_PAUTH_REGS=1
+CTX_INCLUDE_MTE_REGS=1
 SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-rst-bl31 b/tf_config/fvp-spm-rst-bl31
index 88ce5dc..1ec49d2 100644
--- a/tf_config/fvp-spm-rst-bl31
+++ b/tf_config/fvp-spm-rst-bl31
@@ -9,5 +9,6 @@
 CTX_INCLUDE_EL2_REGS=1
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
+CTX_INCLUDE_MTE_REGS=1
 BRANCH_PROTECTION=1
 SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-sve b/tf_config/fvp-spm-sve
index dbe3787..2b732b9 100644
--- a/tf_config/fvp-spm-sve
+++ b/tf_config/fvp-spm-sve
@@ -4,6 +4,7 @@
 BRANCH_PROTECTION=1
 CTX_INCLUDE_EL2_REGS=1
 CTX_INCLUDE_PAUTH_REGS=1
+CTX_INCLUDE_MTE_REGS=1
 ENABLE_SVE_FOR_NS=1
 ENABLE_SVE_FOR_SWD=1
 SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-tbb b/tf_config/fvp-spm-tbb
index 5fa94ea..6b875a1 100644
--- a/tf_config/fvp-spm-tbb
+++ b/tf_config/fvp-spm-tbb
@@ -5,6 +5,7 @@
 CTX_INCLUDE_EL2_REGS=1
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
+CTX_INCLUDE_MTE_REGS=1
 BRANCH_PROTECTION=1
 SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
 ARM_ROTPK_LOCATION=devel_rsa
diff --git a/tf_config/fvp-spm-tbb-dualroot b/tf_config/fvp-spm-tbb-dualroot
index 53c0428..17f982c 100644
--- a/tf_config/fvp-spm-tbb-dualroot
+++ b/tf_config/fvp-spm-tbb-dualroot
@@ -5,6 +5,7 @@
 CTX_INCLUDE_EL2_REGS=1
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
+CTX_INCLUDE_MTE_REGS=1
 BRANCH_PROTECTION=1
 SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
 ARM_ROTPK_LOCATION=devel_rsa
diff --git a/tf_config/fvp-tc0-spm b/tf_config/fvp-tc0-spm
index ba746ab..7b63e1f 100644
--- a/tf_config/fvp-tc0-spm
+++ b/tf_config/fvp-tc0-spm
@@ -3,6 +3,7 @@
 CROSS_COMPILE=aarch64-none-elf-
 CTX_INCLUDE_EL2_REGS=1
 CTX_INCLUDE_PAUTH_REGS=1
+CTX_INCLUDE_MTE_REGS=1
 ENABLE_SVE_FOR_SWD=1
 PLAT=tc
 SCP_BL2=/dev/null