diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index a8b88bc..d1c1024 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -152,8 +152,6 @@
 -C pci.tbu0_pre_smmu_logger.trace_snoops=1
 -C pci.tbu0_pre_smmu_logger.trace_debug=1
 -C pci.pci_smmuv3.mmu.all_error_messages_through_trace=1
--C pci.pci_smmuv3.mmu.howto_identify=use-identify
--C pci.pci_smmuv3.enable_device_id_checks=1
 
 -C TRACE.GenericTrace.trace-sources=verbose_commentary,smmu_initial_transaction,smmu_final_transaction,*.pci.pci_smmuv3.mmu.*.*,*.pci.smmulogger.*,*.pci.tbu0_pre_smmu_logger.*,FVP_Base_RevC_2xAEMv8A.pci.pci_smmuv3,smmu_poison_tw_data
 --plugin $warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/GenericTrace.so
diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index 8cd3dd9..ca0d061 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -30,6 +30,7 @@
 	arch_version="8.4" \
 	initrd_bin="initrd.bin" \
 	el3_payload_bin="manifest.dtb" \
+	has_smmuv3_params="1" \
 		gen_model_params
 
 	model="$model" model_dtb="manifest.dtb" gen_fvp_yaml
diff --git a/run_config/fvp-spm.optee b/run_config/fvp-spm.optee
index ffa93ac..14ac73b 100644
--- a/run_config/fvp-spm.optee
+++ b/run_config/fvp-spm.optee
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -24,6 +24,6 @@
 post_fetch_tf_resource() {
         local model="base-aemv8a"
 
-	model="$model" gen_model_params
+	model="$model" has_smmuv3_params="1" gen_model_params
 	model="$model" gen_fvp_yaml
 }
diff --git a/run_config/fvp-spm.optee.sp b/run_config/fvp-spm.optee.sp
index 2cd5cea..a924c38 100644
--- a/run_config/fvp-spm.optee.sp
+++ b/run_config/fvp-spm.optee.sp
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -34,6 +34,6 @@
 post_fetch_tf_resource() {
         local model="base-aemv8a"
 
-	model="$model" arch_version="8.4" gen_model_params
+	model="$model" arch_version="8.4" has_smmuv3_params="1" gen_model_params
 	model="$model" gen_fvp_yaml
 }
diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index 01c0b17..45d0983 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -56,6 +56,7 @@
 	sp3_pkg="cactus-tertiary.pkg" \
 	initrd_bin="initrd.bin" \
 	el3_payload_bin="manifest.dtb" \
+	has_smmuv3_params="1" \
 		gen_model_params
 	model="$model" model_dtb="manifest.dtb" gen_fvp_yaml
 }