diff --git a/fvp_utils.sh b/fvp_utils.sh
index 7faa220..a4062d1 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -300,7 +300,6 @@
         [coverage_trace_plugin]="coverage_trace.so"
         [dtb]="dtb.bin"
         [el3_payload]="el3_payload.bin"
-        [ete_trace]="libete-plugin.so"
         [etm_trace]="ETMv4ExamplePlugin.so"
         [fip_gpt]="fip_gpt.bin"
         [fip]="fip.bin"
@@ -352,7 +351,6 @@
         [coverage_trace_plugin]="${coverage_trace_plugin}"
         [dtb]="$(gen_bin_url ${model_dtb})"
         [el3_payload]="$(gen_bin_url el3_payload.bin)"
-        [ete_trace]="${tfa_downloads}/FastModelsPortfolio_${model_version}/plugins/${model_flavour}/libete-plugin.so"
         [etm_trace]="${tfa_downloads}/FastModelsPortfolio_${model_version}/plugins/${model_flavour}/ETMv4ExamplePlugin.so"
         [fip]="$(gen_bin_url fip.bin)"
         [fip_gpt]="$(gen_bin_url fip_gpt.bin)"
@@ -409,7 +407,6 @@
         ["[= ]busybox.bin"]="={BUSYBOX}"
         ["[= ]dtb.bin"]="={DTB}"
         ["[= ]el3_payload.bin"]="={EL3_PAYLOAD}"
-        ["[= ].*libete-plugin.so"]="={ETE_TRACE}"
         ["[= ].*ETMv4ExamplePlugin.so"]="={ETM_TRACE}"
         ["[= ]fip_gpt.bin"]="={FIP_GPT}"
         ["[= ]fwu_fip.bin"]="={FWU_FIP}"
diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index dee114b..6f52278 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -10,7 +10,6 @@
 	set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA"
 
 	default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
-	default_var ete_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/libete-plugin.so"
 else
         # OpenCI enviroment
         source "$ci_root/fvp_utils.sh"
@@ -22,7 +21,6 @@
 
         # ScalableVectorExtension is located at /opt/model/*/plugins/${model_flavour}
 	default_var etm_plugin_path "${models_dir/models/plugins}/ETMv4ExamplePlugin.so"
-	default_var ete_plugin_path "${models_dir/models/plugins}/libete-plugin.so"
 fi
 
 default_var is_dual_cluster 1
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 68d7855..6fedcb4 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -47,6 +47,8 @@
 # Number of SPIs that are implemented: Default 224, Maximum 988
 reset_var gicv3_spi_count
 
+reset_var has_ete
+
 # Enable GICv4.1 functionality
 reset_var has_gicv4_1
 
@@ -119,9 +121,6 @@
 # ETM plugin to access ETM trace system registers
 reset_var etm_plugin
 
-# ETE plugin to access ETE trace system registers
-reset_var ete_plugin
-
 # Trace filter register support
 reset_var supports_trace_filter_regs
 
@@ -149,6 +148,7 @@
 ${gicd_virtual_lpi+-C gic_distributor.virtual-lpi-support=$gicd_virtual_lpi}
 ${has_gicv4_1+-C has-gicv4.1=$has_gicv4_1}
 
+${has_ete+-C cluster0.has_ete=1}
 ${has_sve+-C cluster0.has_sve=1}
 ${has_sve+-C cluster0.sve.veclen=$((128 / 8))}
 ${has_sme+-C cluster0.sve.has_sme=1}
@@ -156,6 +156,7 @@
 ${has_sme_fa64+-C cluster0.sve.has_sme_fa64=1}
 ${sme_only+-C cluster0.sve.sme_only=1}
 
+${has_ete+-C cluster1.has_ete=1}
 ${has_sve+-C cluster1.has_sve=1}
 ${has_sve+-C cluster1.sve.veclen=$((128 / 8))}
 ${has_sme+-C cluster1.sve.has_sme=1}
@@ -169,7 +170,6 @@
 ${nvcounter_diag+-C bp.trusted_nv_counter.diagnostics=$nvcounter_diag}
 
 ${etm_plugin+--plugin=$etm_plugin_path}
-${ete_plugin+--plugin=$ete_plugin_path}
 EOF
 
 # TFTF Reboot/Shutdown tests
diff --git a/model/base-aemva.sh b/model/base-aemva.sh
index dee114b..6f52278 100644
--- a/model/base-aemva.sh
+++ b/model/base-aemva.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -10,7 +10,6 @@
 	set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA"
 
 	default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
-	default_var ete_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/libete-plugin.so"
 else
         # OpenCI enviroment
         source "$ci_root/fvp_utils.sh"
@@ -22,7 +21,6 @@
 
         # ScalableVectorExtension is located at /opt/model/*/plugins/${model_flavour}
 	default_var etm_plugin_path "${models_dir/models/plugins}/ETMv4ExamplePlugin.so"
-	default_var ete_plugin_path "${models_dir/models/plugins}/libete-plugin.so"
 fi
 
 default_var is_dual_cluster 1
diff --git a/run_config/fvp-aemv8a.all b/run_config/fvp-aemv8a.all
index 623902a..e05200f 100644
--- a/run_config/fvp-aemv8a.all
+++ b/run_config/fvp-aemv8a.all
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2024, Arm Limited. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -12,8 +12,8 @@
 	uart="1" file="hold_uart.exp" track_expect
 
 	model="$model" \
-		ete_plugin="1" \
 		etm_plugin="1" \
+		has_ete="1" \
 		has_sve="1" \
 		etm_present="1" \
 		amu_present="1" \
diff --git a/run_config/fvp-aemv8a.all.bmcov b/run_config/fvp-aemv8a.all.bmcov
index 80594d2..a849eaa 100644
--- a/run_config/fvp-aemv8a.all.bmcov
+++ b/run_config/fvp-aemv8a.all.bmcov
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2024, Arm Limited. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -14,7 +14,7 @@
 	model="$model" \
 		bmcov_plugin="1" \
 		bmcov_plugin_path="${coverage_trace_plugin}" \
-		ete_plugin="1" \
+		has_ete="1" \
 		etm_plugin="1" \
 		has_sve="1" \
 		etm_present="1" \
diff --git a/run_config/fvp-aemv8a.ctx b/run_config/fvp-aemv8a.ctx
index 2eccefa..cc31189 100644
--- a/run_config/fvp-aemv8a.ctx
+++ b/run_config/fvp-aemv8a.ctx
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2024, Arm Limited. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -14,7 +14,7 @@
 	model="$model" \
 		arch_version="8.9" \
 		accelerator_support_level="1" \
-		ete_plugin="1" \
+		has_ete="1" \
 		etm_plugin="1" \
 		etm_present="1" \
 		has_csv2_2="1" \
diff --git a/run_config/fvp-aemva.ete_trace_ext.bl31_panic.bmcov b/run_config/fvp-aemva.ete_trace_ext.bl31_panic.bmcov
index cce3419..cd8b6ee 100644
--- a/run_config/fvp-aemva.ete_trace_ext.bl31_panic.bmcov
+++ b/run_config/fvp-aemva.ete_trace_ext.bl31_panic.bmcov
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2023, Arm Limited. All rights reserved.
+# Copyright (c) 2023-2025, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -13,8 +13,8 @@
 		set_primary="1" track_expect
 
 	model="$model" \
-		ete_plugin="1" \
 		etm_present="1" \
+		has_ete="1" \
 		supports_trace_buffer_control_regs="1" \
 		supports_trace_filter_regs="2" \
 		bmcov_plugin="1" \