diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index b67b043..8192234 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -444,7 +444,7 @@
 # Accelerator support level enabled
 if [ "$accelerator_support_level" != "0" ]; then
 	cat <<EOF >>"$model_param_file"
--C cluster0.arm_v8_7_accelerator_support_level=1
+-C cluster0.arm_v8_7_accelerator_support_level="$accelerator_support_level"
 EOF
 fi
 
@@ -632,7 +632,7 @@
 # Accelerator support level enabled
 if [ "$accelerator_support_level" != "0" ]; then
 	cat <<EOF >>"$model_param_file"
--C cluster1.arm_v8_7_accelerator_support_level=1
+-C cluster1.arm_v8_7_accelerator_support_level="$accelerator_support_level"
 EOF
 fi
 
diff --git a/run_config/fvp-aemv8a.all b/run_config/fvp-aemv8a.all
index b8e6873..4c763c8 100644
--- a/run_config/fvp-aemv8a.all
+++ b/run_config/fvp-aemv8a.all
@@ -29,7 +29,7 @@
 		supports_trace_filter_regs="2" \
 		supports_system_trace_filter_regs="1" \
 		arch_version="9.4" \
-		accelerator_support_level="1" \
+		accelerator_support_level="3" \
 		gen_model_params
 
 	model="$model" gen_fvp_yaml