diff --git a/model/base-aemv8a-latest-revb.sh b/model/base-aemv8a-latest-revb.sh
index a2a59a6..f16e78f 100644
--- a/model/base-aemv8a-latest-revb.sh
+++ b/model/base-aemv8a-latest-revb.sh
@@ -7,8 +7,6 @@
 
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMvA-AEMvA"
 
-default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
-
 default_var is_dual_cluster 1
 
 source "$ci_root/model/base-aemva-common.sh"
diff --git a/model/base-aemv8a-revb.sh b/model/base-aemv8a-revb.sh
index 3832d47..61d8202 100644
--- a/model/base-aemv8a-revb.sh
+++ b/model/base-aemv8a-revb.sh
@@ -8,8 +8,6 @@
 # Use revb model
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMvA-AEMvA"
 
-default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
-
 default_var is_dual_cluster 1
 
 source "$ci_root/model/base-aemva-common.sh"
diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index 595068d..dee114b 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -9,7 +9,6 @@
 if  is_arm_jenkins_env || upon "$local_ci"; then
 	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 etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
 	default_var ete_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/libete-plugin.so"
 else
@@ -22,7 +21,6 @@
         set_model_path "$models_dir"
 
         # ScalableVectorExtension is located at /opt/model/*/plugins/${model_flavour}
-        default_var sve_plugin_path "${models_dir/models/plugins}/ScalableVectorExtension.so"
 	default_var etm_plugin_path "${models_dir/models/plugins}/ETMv4ExamplePlugin.so"
 	default_var ete_plugin_path "${models_dir/models/plugins}/libete-plugin.so"
 fi
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index a4df8f6..1ad03bc 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -50,7 +50,7 @@
 # Enable GICv4.1 functionality
 reset_var has_gicv4_1
 
-reset_var sve_plugin
+reset_var has_sve
 
 reset_var has_sme
 
@@ -114,11 +114,15 @@
 ${gicd_virtual_lpi+-C gic_distributor.virtual-lpi-support=$gicd_virtual_lpi}
 ${has_gicv4_1+-C has-gicv4.1=$has_gicv4_1}
 
-${sve_plugin+--plugin=$sve_plugin_path}
-${sve_plugin+-C SVE.ScalableVectorExtension.enable_at_reset=0}
-${sve_plugin+-C SVE.ScalableVectorExtension.veclen=$((128 / 8))}
-${has_sme+-C SVE.ScalableVectorExtension.has_sme=1}
-${has_sme2+-C SVE.ScalableVectorExtension.has_sme2=1}
+${has_sve+-C cluster0.has_sve=1}
+${has_sve+-C cluster0.sve.veclen=$((128 / 8))}
+${has_sme+-C cluster0.sve.has_sme=1}
+${has_sme2+-C cluster0.sve.has_sme2=1}
+
+${has_sve+-C cluster1.has_sve=1}
+${has_sve+-C cluster1.sve.veclen=$((128 / 8))}
+${has_sme+-C cluster1.sve.has_sme=1}
+${has_sme2+-C cluster1.sve.has_sme2=1}
 
 ${bmcov_plugin+--plugin=$bmcov_plugin_path}
 
diff --git a/model/base-aemva.sh b/model/base-aemva.sh
index 595068d..dee114b 100644
--- a/model/base-aemva.sh
+++ b/model/base-aemva.sh
@@ -9,7 +9,6 @@
 if  is_arm_jenkins_env || upon "$local_ci"; then
 	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 etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
 	default_var ete_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/libete-plugin.so"
 else
@@ -22,7 +21,6 @@
         set_model_path "$models_dir"
 
         # ScalableVectorExtension is located at /opt/model/*/plugins/${model_flavour}
-        default_var sve_plugin_path "${models_dir/models/plugins}/ScalableVectorExtension.so"
 	default_var etm_plugin_path "${models_dir/models/plugins}/ETMv4ExamplePlugin.so"
 	default_var ete_plugin_path "${models_dir/models/plugins}/libete-plugin.so"
 fi
diff --git a/run_config/fvp-aemv8a.all b/run_config/fvp-aemv8a.all
index 26033aa..303a3cc 100644
--- a/run_config/fvp-aemv8a.all
+++ b/run_config/fvp-aemv8a.all
@@ -14,7 +14,7 @@
 	model="$model" \
 		ete_plugin="1" \
 		etm_plugin="1" \
-		sve_plugin="1" \
+		has_sve="1" \
 		etm_present="1" \
 		amu_present="1" \
 		has_sme="1" has_sme2="1" \
diff --git a/run_config/fvp-aemv8a.all.bmcov b/run_config/fvp-aemv8a.all.bmcov
index 5317e52..80594d2 100644
--- a/run_config/fvp-aemv8a.all.bmcov
+++ b/run_config/fvp-aemv8a.all.bmcov
@@ -16,7 +16,7 @@
 		bmcov_plugin_path="${coverage_trace_plugin}" \
 		ete_plugin="1" \
 		etm_plugin="1" \
-		sve_plugin="1" \
+		has_sve="1" \
 		etm_present="1" \
 		amu_present="1" \
 		has_sme="1" has_sme2="1" \
diff --git a/run_config/fvp-aemv8a.sve.bmcov b/run_config/fvp-aemv8a.sve.bmcov
index d07f58b..2aafbe7 100644
--- a/run_config/fvp-aemv8a.sve.bmcov
+++ b/run_config/fvp-aemv8a.sve.bmcov
@@ -11,7 +11,7 @@
 	model="$model" \
 		bmcov_plugin_path="${coverage_trace_plugin}" \
 		bmcov_plugin="1" \
-		sve_plugin="1" \
+		has_sve="1" \
 		gen_model_params
 
 	model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-spm.sve+amu b/run_config/fvp-spm.sve+amu
index a121bc3..ff4ae05 100644
--- a/run_config/fvp-spm.sve+amu
+++ b/run_config/fvp-spm.sve+amu
@@ -31,7 +31,7 @@
 		has_branch_target_exception="1" \
 		has_smmuv3_params="1" \
 		memory_tagging_support_level="2" \
-		sve_plugin="1" \
+		has_sve="1" \
 		gicd_are_fixed_one="1" \
 		gicv3_ext_interrupt_range="1" \
 		gicd_ext_ppi_count="64" \
diff --git a/run_config/fvp-spm.sve+amu.bmcov b/run_config/fvp-spm.sve+amu.bmcov
index c6f04aa..721fb72 100644
--- a/run_config/fvp-spm.sve+amu.bmcov
+++ b/run_config/fvp-spm.sve+amu.bmcov
@@ -35,7 +35,7 @@
 		has_branch_target_exception="1" \
 		has_smmuv3_params="1" \
 		memory_tagging_support_level="2" \
-		sve_plugin="1" \
+		has_sve="1" \
 		gicd_are_fixed_one="1" \
 		gicv3_ext_interrupt_range="1" \
 		gicd_ext_ppi_count="64" \