diff --git a/model/base-aemv8a-quad.sh b/model/base-aemv8a-quad.sh
index a894678..ee00815 100644
--- a/model/base-aemv8a-quad.sh
+++ b/model/base-aemv8a-quad.sh
@@ -53,4 +53,21 @@
 
 ${ccn502_cache_size_in_kbytes+-C ccn502.cache_size_in_kbytes=$ccn502_cache_size_in_kbytes}
 
+${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}
+${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}
+${etm_present+-C cluster2.cpu0.etm-present=$etm_present}
+${etm_present+-C cluster2.cpu1.etm-present=$etm_present}
+${etm_present+-C cluster2.cpu2.etm-present=$etm_present}
+${etm_present+-C cluster2.cpu3.etm-present=$etm_present}
+${etm_present+-C cluster3.cpu0.etm-present=$etm_present}
+${etm_present+-C cluster3.cpu1.etm-present=$etm_present}
+${etm_present+-C cluster3.cpu2.etm-present=$etm_present}
+${etm_present+-C cluster3.cpu3.etm-present=$etm_present}
+
 EOF
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
diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index 87f2b10..f9ce3a8 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -12,6 +12,11 @@
 default_var data_instance cluster0.cpu0
 default_var cache_state_modelled 1
 default_var print_stat 1
+# Trace unit functionally works in FVP model by enabling ETM/ETE trace
+# unit along with its plugin.
+# Hence disabled ETM by default, and enable it along with its plugin whenever
+# needed.
+default_var etm_present 0
 
 reset_var has_bl1
 reset_var has_fip