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" \