diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 00f1bf5..018e576 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -106,6 +106,9 @@
 # Enable FEAT_GCS
 reset_var has_gcs
 
+# Enable FEAT_FGT2
+reset_var has_fgt2
+
 # Layout of MPIDR. 0=AFF0 is CPUID, 1=AFF1 is CPUID
 reset_var mpidr_layout
 
@@ -380,6 +383,13 @@
 EOF
 fi
 
+if [ "$arch_version" = "9.3" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_arm_v9-3=1
+-C cluster1.has_arm_v9-3=1
+EOF
+fi
+
 if [ "$arch_version" = "9.4" ]; then
 	cat <<EOF >>"$model_param_file"
 -C cluster0.has_arm_v9-4=1
@@ -455,6 +465,13 @@
 EOF
 fi
 
+if [ "$has_fgt2" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_fgt2=2
+-C cluster1.has_fgt2=2
+EOF
+fi
+
 if [ "$has_ecv" = "1" ]; then
 	cat <<EOF >>"$model_param_file"
 -C cluster0.ecv_support_level=2