diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index d47162e..67f11e3 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -582,6 +582,13 @@
 EOF
 fi
 
+if [ "$has_twed" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_delayed_wfe_trap=2
+-C cluster1.has_delayed_wfe_trap=2
+EOF
+fi
+
 #------------ Cluster1 configuration (if exists) --------------
 if [ "$is_dual_cluster" = "1" ]; then
 	cat <<EOF >>"$model_param_file"
diff --git a/run_config/fvp-aemv8a.all b/run_config/fvp-aemv8a.all
index 9ed07de..9c55dce 100644
--- a/run_config/fvp-aemv8a.all
+++ b/run_config/fvp-aemv8a.all
@@ -33,6 +33,7 @@
 		has_s2poe="1" \
 		has_gcs="1" \
 		has_pmuv3p7="1" \
+		has_twed="1" \
 		has_v8_9_debug_extension="1" \
 		memory_tagging_support_level="3" \
 		supports_branch_record_buffer_control_regs="1" \
diff --git a/run_config/fvp-aemv8a.all.bmcov b/run_config/fvp-aemv8a.all.bmcov
index 7fdf729..d930e1b 100644
--- a/run_config/fvp-aemv8a.all.bmcov
+++ b/run_config/fvp-aemv8a.all.bmcov
@@ -33,6 +33,7 @@
 		has_s2poe="1" \
 		has_gcs="1" \
 		has_pmuv3p7="1" \
+		has_twed="1" \
 		has_v8_9_debug_extension="1" \
 		memory_tagging_support_level="3" \
 		supports_branch_record_buffer_control_regs="1" \
diff --git a/run_config/fvp-spm.all b/run_config/fvp-spm.all
index 645ed14..a7ab872 100644
--- a/run_config/fvp-spm.all
+++ b/run_config/fvp-spm.all
@@ -46,6 +46,7 @@
 		has_s2poe="1" \
 		has_gcs="1" \
 		has_pmuv3p7="1" \
+		has_twed="1" \
 		has_v8_9_debug_extension="1" \
 		memory_tagging_support_level="3" \
 		supports_branch_record_buffer_control_regs="1" \
diff --git a/run_config/fvp-spm.all.bmcov b/run_config/fvp-spm.all.bmcov
index c3b9485..467e064 100644
--- a/run_config/fvp-spm.all.bmcov
+++ b/run_config/fvp-spm.all.bmcov
@@ -50,6 +50,7 @@
 		has_s2poe="1" \
 		has_gcs="1" \
 		has_pmuv3p7="1" \
+		has_twed="1" \
 		has_v8_9_debug_extension="1" \
 		memory_tagging_support_level="3" \
 		supports_branch_record_buffer_control_regs="1" \