diff --git a/tf_config/fvp-tbb-tc2-mb b/tf_config/fvp-tbb-tc2-mb
index b9dfc0a..7e7715a 100644
--- a/tf_config/fvp-tbb-tc2-mb
+++ b/tf_config/fvp-tbb-tc2-mb
@@ -1,3 +1,4 @@
+ARM_GPT_SUPPORT=1
 ARM_ROTPK_LOCATION=devel_rsa
 CROSS_COMPILE=aarch64-none-elf-
 GENERATE_COT=1
diff --git a/tf_config/fvp-tc2-nv-ctrs b/tf_config/fvp-tc2-nv-ctrs
index 949f7d8..5789a41 100644
--- a/tf_config/fvp-tc2-nv-ctrs
+++ b/tf_config/fvp-tc2-nv-ctrs
@@ -1,3 +1,4 @@
+ARM_GPT_SUPPORT=1
 ARM_ROTPK_LOCATION=devel_rsa
 CROSS_COMPILE=aarch64-none-elf-
 GENERATE_COT=1
diff --git a/tf_config/fvp-tc2-rotpk b/tf_config/fvp-tc2-rotpk
index 3ed20bd..c151c69 100644
--- a/tf_config/fvp-tc2-rotpk
+++ b/tf_config/fvp-tc2-rotpk
@@ -1,3 +1,4 @@
+ARM_GPT_SUPPORT=1
 ARM_ROTPK_LOCATION=devel_rsa
 CROSS_COMPILE=aarch64-none-elf-
 GENERATE_COT=1
diff --git a/tf_config/fvp-tc2-spm b/tf_config/fvp-tc2-spm
index 476875f..edef88b 100644
--- a/tf_config/fvp-tc2-spm
+++ b/tf_config/fvp-tc2-spm
@@ -1,7 +1,7 @@
 ARM_ARCH_MINOR=5
+ARM_GPT_SUPPORT=1
 BRANCH_PROTECTION=1
 CROSS_COMPILE=aarch64-none-elf-
-CTX_INCLUDE_EL2_REGS=1
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-tc2-tbb b/tf_config/fvp-tc2-tbb
index fa4c4db..0aec3e9 100644
--- a/tf_config/fvp-tc2-tbb
+++ b/tf_config/fvp-tc2-tbb
@@ -1,5 +1,10 @@
+ARM_ARCH_MINOR=7
 ARM_ROTPK_LOCATION=devel_rsa
+ARM_GPT_SUPPORT=1
+BRANCH_PROTECTION=1
 CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_PAUTH_REGS=1
+ENABLE_SVE_FOR_SWD=1
 GENERATE_COT=1
 PLAT=tc
 ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem