diff --git a/tftf_config/fvp-fwu-pauth b/tftf_config/fvp-fwu-bti
similarity index 82%
copy from tftf_config/fvp-fwu-pauth
copy to tftf_config/fvp-fwu-bti
index e6a4f23..6147012 100644
--- a/tftf_config/fvp-fwu-pauth
+++ b/tftf_config/fvp-fwu-bti
@@ -1,6 +1,6 @@
 ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=4
 CROSS_COMPILE=aarch64-none-elf-
-ENABLE_PAUTH=1
 NEW_TEST_SESSION=0
 PLAT=fvp
 TESTS=fwu
diff --git a/tftf_config/fvp-fwu-pauth b/tftf_config/fvp-fwu-pauth-standard
similarity index 82%
rename from tftf_config/fvp-fwu-pauth
rename to tftf_config/fvp-fwu-pauth-standard
index e6a4f23..9bb670f 100644
--- a/tftf_config/fvp-fwu-pauth
+++ b/tftf_config/fvp-fwu-pauth-standard
@@ -1,6 +1,6 @@
 ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=1
 CROSS_COMPILE=aarch64-none-elf-
-ENABLE_PAUTH=1
 NEW_TEST_SESSION=0
 PLAT=fvp
 TESTS=fwu
diff --git a/tftf_config/fvp-pauth b/tftf_config/fvp-pauth-bti
similarity index 74%
copy from tftf_config/fvp-pauth
copy to tftf_config/fvp-pauth-bti
index 2e6c76c..f952a08 100644
--- a/tftf_config/fvp-pauth
+++ b/tftf_config/fvp-pauth-bti
@@ -1,4 +1,4 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
-ENABLE_PAUTH=1
+BRANCH_PROTECTION=4
+CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
diff --git a/tftf_config/fvp-pauth b/tftf_config/fvp-pauth-standard
similarity index 74%
rename from tftf_config/fvp-pauth
rename to tftf_config/fvp-pauth-standard
index 2e6c76c..ccd7cfb 100644
--- a/tftf_config/fvp-pauth
+++ b/tftf_config/fvp-pauth-standard
@@ -1,4 +1,4 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
-ENABLE_PAUTH=1
+BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp