diff --git a/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti+qarma3-debug b/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti+qarma3-debug
new file mode 100644
index 0000000..03b40e4
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5+bti+qarma3-debug
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2019-2022 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-standard:fvp-tftf-fip.tftf-aemva.8_6+bti-debug b/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_6+bti-debug
similarity index 100%
rename from group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemva.8_6+bti-debug
rename to group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_6+bti-debug
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index db76fa5..77b64eb 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -344,6 +344,13 @@
 EOF
 fi
 
+# FEAT_PACQARMA3 is enabled
+if [ "$has_pacqarma3" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_qarma3_pac=1
+EOF
+fi
+
 # FEAT_RNG is enabled
 if [ "$has_rng" = "1" ]; then
 	cat <<EOF >>"$model_param_file"
@@ -499,6 +506,13 @@
 EOF
 fi
 
+# FEAT_PACQARMA3 is enabled
+if [ "$has_pacqarma3" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster1.has_qarma3_pac=1
+EOF
+fi
+
 # FEAT_RNG is enabled
 if [ "$has_rng" = "1" ]; then
 	cat <<EOF >>"$model_param_file"
diff --git a/run_config/fvp-aemv8a.8_5+bti+qarma3 b/run_config/fvp-aemv8a.8_5+bti+qarma3
new file mode 100644
index 0000000..afe4e5d
--- /dev/null
+++ b/run_config/fvp-aemv8a.8_5+bti+qarma3
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2022 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" \
+	has_pacqarma3="1" \
+		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_RevC-2xAEMvA" \
+	       gen_fvp_yaml
+}
diff --git a/run_config/fvp-aemv8a.8_6+bti b/run_config/fvp-aemv8a.8_6+bti
new file mode 100644
index 0000000..2134dda
--- /dev/null
+++ b/run_config/fvp-aemv8a.8_6+bti
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_fetch_tf_resource() {
+	model="base-aemv8a"
+
+	model="$model" \
+	arch_version="8.6" \
+	has_branch_target_exception="1" \
+		gen_model_params
+
+	uart="0" set_expect_variable "num_cpus" "4"
+	model="$model" \
+	model_bin="FVP_Base_RevC-2xAEMvA" \
+		gen_fvp_yaml
+}
diff --git a/run_config/fvp-aemva.8_6+bti b/run_config/fvp-aemva.8_6+bti
deleted file mode 100644
index 7e9f252..0000000
--- a/run_config/fvp-aemva.8_6+bti
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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"
-}