diff --git a/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_7 b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_7
new file mode 100644
index 0000000..b8939c8
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_7
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2022, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 751963e..6641287 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -250,6 +250,12 @@
 EOF
 fi
 
+if [ "$arch_version" = "8.7" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_arm_v8-7=1
+EOF
+fi
+
 # Parameters for fault injection
 if [ "$fault_inject" = "1" ]; then
 	cat <<EOF >>"$model_param_file"
@@ -356,6 +362,12 @@
 EOF
 fi
 
+if [ "$arch_version" = "8.7" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster1.has_arm_v8-7=1
+EOF
+fi
+
 # Parameters for fault injection
 if [ "$fault_inject" = "1" ]; then
 	cat <<EOF >>"$model_param_file"
diff --git a/run_config/fvp-aemv8a.8_7 b/run_config/fvp-aemv8a.8_7
new file mode 100644
index 0000000..1028042
--- /dev/null
+++ b/run_config/fvp-aemv8a.8_7
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_fetch_tf_resource() {
+	local model="base-aemv8a"
+	model="$model"  arch_version="8.7" \
+		gen_model_params
+
+	model="$model" gen_fvp_yaml
+}