diff --git a/group/spm-l3-boot-tests-rme/fvp-default,fvp-spm-rme,fvp-default:fvp-spm.trp.tftf-tftf.rme b/group/spm-l2-boot-tests/fvp-default,fvp-spm-rme,fvp-default:fvp-spm.trp.tftf-tftf.rme
similarity index 100%
rename from group/spm-l3-boot-tests-rme/fvp-default,fvp-spm-rme,fvp-default:fvp-spm.trp.tftf-tftf.rme
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-rme,fvp-default:fvp-spm.trp.tftf-tftf.rme
diff --git a/group/tf-l3-boot-tests-rme/fvp-rme,fvp-default:fvp-trp.tftf-tftf.rme b/group/tf-l1-build-fvp/fvp-rme:nil
similarity index 100%
copy from group/tf-l3-boot-tests-rme/fvp-rme,fvp-default:fvp-trp.tftf-tftf.rme
copy to group/tf-l1-build-fvp/fvp-rme:nil
diff --git a/group/tf-l3-boot-tests-rme/fvp-rme,fvp-default:fvp-trp.tftf-tftf.rme b/group/tftf-l2-fvp/fvp-rme,fvp-default:fvp-trp.tftf-tftf.rme
similarity index 100%
rename from group/tf-l3-boot-tests-rme/fvp-rme,fvp-default:fvp-trp.tftf-tftf.rme
rename to group/tftf-l2-fvp/fvp-rme,fvp-default:fvp-trp.tftf-tftf.rme
diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index fba3b73..d5fa43e 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -7,15 +7,9 @@
 
 # Use revc model
 if  is_arm_jenkins_env || upon "$local_ci"; then
-	# TODO: For now rme-enabled model is located at a differnt location.
-	# Fix this path once the model becomes part of the "external" models.
-	if [ "$has_rme" = "1" ]; then
-		set_model_path "$project_filer/models/rme/FVP_Base_RevC-2xAEMvA_11.15_18/Base_RevC_AEMvA_pkg/models/Linux64_GCC-6.4/FVP_Base_RevC-2xAEMvA"
-	else
-        	set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA"
-	fi
+	set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA"
 
-        default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
+	default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 else
         # OpenCI enviroment
         source "$ci_root/fvp_utils.sh"
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 3d9d7be..751963e 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -170,6 +170,8 @@
 
 ${restriction_on_speculative_execution+-C cluster0.restriction_on_speculative_execution=$restriction_on_speculative_execution}
 
+${restriction_on_speculative_execution+-C cluster0.restriction_on_speculative_execution_aarch32=$restriction_on_speculative_execution}
+
 ${gicv3_ext_interrupt_range+-C cluster0.gicv3.extended-interrupt-range-support=$gicv3_ext_interrupt_range}
 
 ${mpidr_layout+-C cluster0.mpidr_layout=$mpidr_layout}
@@ -312,6 +314,8 @@
 
 ${restriction_on_speculative_execution+-C cluster1.restriction_on_speculative_execution=$restriction_on_speculative_execution}
 
+${restriction_on_speculative_execution+-C cluster1.restriction_on_speculative_execution_aarch32=$restriction_on_speculative_execution}
+
 ${gicv3_ext_interrupt_range+-C cluster1.gicv3.extended-interrupt-range-support=$gicv3_ext_interrupt_range}
 
 ${mpidr_layout+-C cluster1.mpidr_layout=$mpidr_layout}
diff --git a/run_config/fvp-tftf.rme b/run_config/fvp-tftf.rme
index 91aaae2..185c1ea 100644
--- a/run_config/fvp-tftf.rme
+++ b/run_config/fvp-tftf.rme
@@ -25,7 +25,6 @@
         local model="base-aemv8a"
 
 	model="$model" \
-	model_build="18" \
 	arch_version="8.6" \
 	has_branch_target_exception="1" \
 	restriction_on_speculative_execution="2" \