diff --git a/model/cortex-a710.sh b/model/cortex-a710.sh
index 8fa0a20..05cc49d 100644
--- a/model/cortex-a710.sh
+++ b/model/cortex-a710.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_Cortex-A710x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A710"
 
 source "$ci_root/model/fvp_common.sh"
 
@@ -15,6 +15,8 @@
 -C bp.terminal_2.start_port=5002
 -C bp.terminal_3.start_port=5003
 
+-C cluster0.NUM_CORES=4
+
 -C pctl.use_in_cluster_ppu=true
 -C cluster0.core_power_on_by_default=false
 EOF
diff --git a/model/cortex-x2.sh b/model/cortex-x2.sh
index 4254a35..e664548 100644
--- a/model/cortex-x2.sh
+++ b/model/cortex-x2.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_Cortex-X2x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-X2"
 
 source "$ci_root/model/fvp_common.sh"
 
@@ -15,6 +15,8 @@
 -C bp.terminal_2.start_port=5002
 -C bp.terminal_3.start_port=5003
 
+-C cluster0.NUM_CORES=4
+
 -C pctl.use_in_cluster_ppu=true
 -C cluster0.core_power_on_by_default=false
 EOF
diff --git a/model/neoverse_n2.sh b/model/neoverse_n2.sh
index cc63722..eb17652 100644
--- a/model/neoverse_n2.sh
+++ b/model/neoverse_n2.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version_11_16/$model_build_11_16/external/models/$model_flavour_11_16/FVP_Base_Neoverse-N1x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-N2"
 
 source "$ci_root/model/fvp_common.sh"