diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 4f0ac96..518ff3d 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -323,6 +323,13 @@
 EOF
 fi
 
+if [ "$arch_version" = "8.9" ]; then
+       cat <<EOF >>"$model_param_file"
+-C cluster0.has_arm_v8-9=1
+-C cluster1.has_arm_v8-9=1
+EOF
+fi
+
 if [ "$arch_version" = "9.2" ]; then
 	cat <<EOF >>"$model_param_file"
 -C cluster0.has_arm_v9-2=1
diff --git a/run_config/fvp-aemv8a.all b/run_config/fvp-aemv8a.all
index 303a3cc..fed51a7 100644
--- a/run_config/fvp-aemv8a.all
+++ b/run_config/fvp-aemv8a.all
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2023, Arm Limited. All rights reserved.
+# Copyright (c) 2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -25,7 +25,7 @@
 		supports_trace_buffer_control_regs="1" \
 		supports_trace_filter_regs="2" \
 		supports_system_trace_filter_regs="1" \
-		arch_version="9.2" \
+		arch_version="8.9" \
 		gen_model_params
 
 	model="$model" gen_fvp_yaml