diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
rename from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
rename to group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemva.8_6+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemva.8_6+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemva.8_6-debug b/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemva.8_6-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemva.8_6-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-bti-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-bti-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-bti-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-tsp-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-bti-tsp-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-bti-tsp-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-tsp-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-bti-tsp-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-ctx-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-ctx-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-ctx-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-ctx-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-ctx-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-ctx-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-ctx-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-ctx-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-ctx-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-ctx-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-pac-ret-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-pac-ret-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-pac-ret-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-pac-ret-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-pac-ret-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-pac-ret-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-standard-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-standard-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-standard-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-standard-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti-debug
diff --git a/group/tftf-l2-fvp/fvp-pauth-standard-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index abdb0d2..0000000
--- a/group/tftf-l2-fvp/fvp-pauth-standard-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-pauth,fvp-fwu-pauth-standard:fvp-tftf.fwu-aemv8a.8_5 b/group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-pauth,fvp-fwu-pauth-standard:fvp-tftf.fwu-aemv8a.8_5+bti
similarity index 100%
rename from group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-pauth,fvp-fwu-pauth-standard:fvp-tftf.fwu-aemv8a.8_5
rename to group/tftf-l2-fwu/fvp-tspd-tbb-mbedtls-pauth,fvp-fwu-pauth-standard:fvp-tftf.fwu-aemv8a.8_5+bti
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 3fe1a9a..df6a786 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -128,6 +128,8 @@
 
 ${memory_tagging_support_level+-C cluster0.memory_tagging_support_level=$memory_tagging_support_level}
 
+${has_branch_target_exception+-C cluster0.has_branch_target_exception=$has_branch_target_exception}
+
 ${gicv3_ext_interrupt_range+-C cluster0.gicv3.extended-interrupt-range-support=$gicv3_ext_interrupt_range}
 EOF
 
@@ -201,6 +203,8 @@
 
 ${memory_tagging_support_level+-C cluster1.memory_tagging_support_level=$memory_tagging_support_level}
 
+${has_branch_target_exception+-C cluster1.has_branch_target_exception=$has_branch_target_exception}
+
 ${gicv3_ext_interrupt_range+-C cluster1.gicv3.extended-interrupt-range-support=$gicv3_ext_interrupt_range}
 EOF
 
diff --git a/run_config/fvp-aemv8a.8_5+bti b/run_config/fvp-aemv8a.8_5+bti
new file mode 100644
index 0000000..51e02f1
--- /dev/null
+++ b/run_config/fvp-aemv8a.8_5+bti
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2020 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_fetch_tf_resource() {
+	model="base-aemv8a" \
+	arch_version="8.5" \
+	has_branch_target_exception="1" \
+		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_RevC-2xAEMv8A" \
+	       gen_fvp_yaml
+}
diff --git a/run_config/fvp-aemva.8_6+bti b/run_config/fvp-aemva.8_6+bti
new file mode 100644
index 0000000..7e9f252
--- /dev/null
+++ b/run_config/fvp-aemva.8_6+bti
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2020 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_fetch_tf_resource() {
+	model="base-aemva" \
+	arch_version="8.6" \
+	has_branch_target_exception="1" \
+		gen_model_params
+	uart="0" set_expect_variable "num_cpus" "4"
+}