diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 518ff3d..f1a5389 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -215,6 +215,8 @@
 
 ${supports_multi_threading+-C cluster0.supports_multi_threading=$supports_multi_threading}
 
+${has_v8_9_debug_extension+-C cluster0.has_v8_9_debug_extension=$has_v8_9_debug_extension}
+
 ${etm_present+-C cluster0.cpu0.etm-present=$etm_present}
 ${etm_present+-C cluster0.cpu1.etm-present=$etm_present}
 ${etm_present+-C cluster0.cpu2.etm-present=$etm_present}
@@ -461,6 +463,8 @@
 
 ${supports_multi_threading+-C cluster1.supports_multi_threading=$supports_multi_threading}
 
+${has_v8_9_debug_extension+-C cluster1.has_v8_9_debug_extension=$has_v8_9_debug_extension}
+
 ${etm_present+-C cluster1.cpu0.etm-present=$etm_present}
 ${etm_present+-C cluster1.cpu1.etm-present=$etm_present}
 ${etm_present+-C cluster1.cpu2.etm-present=$etm_present}
diff --git a/run_config/fvp-aemv8a.all b/run_config/fvp-aemv8a.all
index fed51a7..ab693f6 100644
--- a/run_config/fvp-aemv8a.all
+++ b/run_config/fvp-aemv8a.all
@@ -20,6 +20,7 @@
 		has_sme="1" has_sme2="1" \
 		has_mpam="1" \
 		has_ecv="1" \
+		has_v8_9_debug_extension="1" \
 		memory_tagging_support_level="3" \
 		supports_branch_record_buffer_control_regs="1" \
 		supports_trace_buffer_control_regs="1" \