diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 95b9261..de4df6a 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -300,6 +300,20 @@
 EOF
 fi
 
+# FEAT_BRBE is enabled
+if [ "$has_brbe" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_brbe=1
+EOF
+fi
+
+# FEAT_TRBE is enabled
+if [ "$has_trbe" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster0.has_trbe=1
+EOF
+fi
+
 #------------ Cluster1 configuration (if exists) --------------
 if [ "$is_dual_cluster" = "1" ]; then
 	cat <<EOF >>"$model_param_file"
@@ -401,6 +415,20 @@
 EOF
 fi
 
+# FEAT_BRBE is enabled
+if [ "$has_brbe" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster1.has_brbe=1
+EOF
+fi
+
+# FEAT_TRBE is enabled
+if [ "$has_trbe" = "1" ]; then
+	cat <<EOF >>"$model_param_file"
+-C cluster1.has_trbe=1
+EOF
+fi
+
 # FEAT_RME is enabled
 if [ "$has_rme" = "1" ]; then
 	cat <<EOF >>"$model_param_file"
diff --git a/run_config/fvp-aemv8a.arch_features b/run_config/fvp-aemv8a.arch_features
index 0ae5bd5..d39dff0 100644
--- a/run_config/fvp-aemv8a.arch_features
+++ b/run_config/fvp-aemv8a.arch_features
@@ -7,7 +7,11 @@
 
 post_fetch_tf_resource() {
 	local model="base-aemv8a"
-	model="$model"  arch_version="8.7" \
+
+	model="$model" \
+	arch_version="8.7" \
+	has_brbe="1" \
+	has_trbe="1" \
 		gen_model_params
 
 	model="$model" gen_fvp_yaml