diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index bd206c0..b67b043 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -359,6 +359,13 @@
 EOF
 fi
 
+if [ "$arch_version" = "9.4" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_arm_v9-4=1
+-C cluster1.has_arm_v9-4=1
+EOF
+fi
+
 # Parameters for fault injection
 if [ "$fault_inject" = "1" ]; then
 	cat <<EOF >>"$model_param_file"
@@ -441,6 +448,22 @@
 EOF
 fi
 
+# FEAT_THE is enabled
+if [ "$has_translation_hardening" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_translation_hardening=1
+-C cluster1.has_translation_hardening=1
+EOF
+fi
+
+# FEAT_D128 is enabled
+if [ "$has_d128" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_128_bit_tt_descriptors="1"
+-C cluster1.has_128_bit_tt_descriptors="1"
+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 5d9fef6..b8e6873 100644
--- a/run_config/fvp-aemv8a.all
+++ b/run_config/fvp-aemv8a.all
@@ -20,13 +20,15 @@
 		has_sme="1" has_sme2="1" \
 		has_mpam="1" \
 		has_ecv="1" \
+		has_translation_hardening="1" \
+		has_d128="1" \
 		has_v8_9_debug_extension="1" \
 		memory_tagging_support_level="3" \
 		supports_branch_record_buffer_control_regs="1" \
 		supports_trace_buffer_control_regs="1" \
 		supports_trace_filter_regs="2" \
 		supports_system_trace_filter_regs="1" \
-		arch_version="8.9" \
+		arch_version="9.4" \
 		accelerator_support_level="1" \
 		gen_model_params