diff --git a/run_config/fvp-spm+romlib.bmcov b/run_config/fvp-spm+romlib.bmcov
index d6a90e4..38417ac 100644
--- a/run_config/fvp-spm+romlib.bmcov
+++ b/run_config/fvp-spm+romlib.bmcov
@@ -38,6 +38,10 @@
 		has_branch_target_exception="1" \
 		has_smmuv3_params="1" \
 		memory_tagging_support_level="2" \
+		gicd_are_fixed_one="1" \
+		gicv3_ext_interrupt_range="1" \
+		gicd_ext_ppi_count="64" \
+		gicd_ext_spi_count="1024" \
 		gen_model_params
 
 	model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-spm-tftf.rme.bmcov b/run_config/fvp-spm-tftf.rme.bmcov
index bd6b5c2..79c5cfc 100644
--- a/run_config/fvp-spm-tftf.rme.bmcov
+++ b/run_config/fvp-spm-tftf.rme.bmcov
@@ -35,6 +35,10 @@
 		has_branch_target_exception="1" \
 		has_rme="1" \
 		has_smmuv3_params="1" \
+		gicd_are_fixed_one="1" \
+		gicv3_ext_interrupt_range="1" \
+		gicd_ext_ppi_count="64" \
+		gicd_ext_spi_count="1024" \
 		memory_tagging_support_level="2" \
 		restriction_on_speculative_execution="2" \
 		gen_model_params
diff --git a/run_config/fvp-spm.48bit_pa.bmcov b/run_config/fvp-spm.48bit_pa.bmcov
index 90657b9..8a5d58d 100644
--- a/run_config/fvp-spm.48bit_pa.bmcov
+++ b/run_config/fvp-spm.48bit_pa.bmcov
@@ -34,6 +34,10 @@
 		has_smmuv3_params="1" \
 		memory_tagging_support_level="2" \
 		pa_size="48" \
+		gicd_are_fixed_one="1" \
+		gicv3_ext_interrupt_range="1" \
+		gicd_ext_ppi_count="64" \
+		gicd_ext_spi_count="1024" \
 		gen_model_params
 
 	model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-spm.bmcov b/run_config/fvp-spm.bmcov
index 8591fb8..009688e 100644
--- a/run_config/fvp-spm.bmcov
+++ b/run_config/fvp-spm.bmcov
@@ -33,6 +33,10 @@
 		has_branch_target_exception="1" \
 		has_smmuv3_params="1" \
 		memory_tagging_support_level="2" \
+		gicd_are_fixed_one="1" \
+		gicv3_ext_interrupt_range="1" \
+		gicd_ext_ppi_count="64" \
+		gicd_ext_spi_count="1024" \
 		gen_model_params
 
 	model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-spm.optee.sp.bmcov b/run_config/fvp-spm.optee.sp.bmcov
index 70261f3..7c2df87 100644
--- a/run_config/fvp-spm.optee.sp.bmcov
+++ b/run_config/fvp-spm.optee.sp.bmcov
@@ -43,6 +43,10 @@
 		has_branch_target_exception="1" \
 		has_smmuv3_params="1" \
 		memory_tagging_support_level="2" \
+		gicd_are_fixed_one="1" \
+		gicv3_ext_interrupt_range="1" \
+		gicd_ext_ppi_count="64" \
+		gicd_ext_spi_count="1024" \
 		gen_model_params
 
 	model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-spm.sve+amu.bmcov b/run_config/fvp-spm.sve+amu.bmcov
index 8e21c19..c6f04aa 100644
--- a/run_config/fvp-spm.sve+amu.bmcov
+++ b/run_config/fvp-spm.sve+amu.bmcov
@@ -36,6 +36,10 @@
 		has_smmuv3_params="1" \
 		memory_tagging_support_level="2" \
 		sve_plugin="1" \
+		gicd_are_fixed_one="1" \
+		gicv3_ext_interrupt_range="1" \
+		gicd_ext_ppi_count="64" \
+		gicd_ext_spi_count="1024" \
 		gen_model_params
 
 	model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-spm.trp.tftf.bmcov b/run_config/fvp-spm.trp.tftf.bmcov
index 729bc6e..891c7c5 100644
--- a/run_config/fvp-spm.trp.tftf.bmcov
+++ b/run_config/fvp-spm.trp.tftf.bmcov
@@ -24,6 +24,10 @@
 
 	model="$model" \
 		arch_version="8.5" \
+		gicd_are_fixed_one="1" \
+		gicv3_ext_interrupt_range="1" \
+		gicd_ext_ppi_count="64" \
+		gicd_ext_spi_count="1024" \
 		gen_model_params
 
 	model="$model" gen_fvp_yaml