diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 5d31b91..a0fc23a 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -150,6 +150,11 @@
 
 ${supports_multi_threading+-C cluster0.supports_multi_threading=$supports_multi_threading}
 
+${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}
+${etm_present+-C cluster0.cpu3.etm-present=$etm_present}
+
 EOF
 
 if [ "$has_smmuv3_params" = "1" ]; then
@@ -252,6 +257,12 @@
 ${mpidr_layout+-C cluster1.mpidr_layout=$mpidr_layout}
 
 ${supports_multi_threading+-C cluster1.supports_multi_threading=$supports_multi_threading}
+
+${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}
+${etm_present+-C cluster1.cpu3.etm-present=$etm_present}
+
 EOF
 
 # Parameters to select architecture version