diff --git a/fvp_utils.sh b/fvp_utils.sh
index 2685c38..08c3eaa 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -45,12 +45,12 @@
 default_model_dtb="dtb.bin"
 
 # FVP containers and model paths
-fvp_arm_std_library_11_16="fvp:fvp_arm_std_library_${model_version_11_16}_${model_build_11_16};/opt/model/FVP_ARM_Std_Library/FVP_Base"
 fvp_arm_std_library_11_17="fvp:fvp_arm_std_library_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_ARM_Std_Library/FVP_Base"
+
 fvp_arm_std_library="fvp:fvp_arm_std_library_${model_version}_${model_build};/opt/model/FVP_ARM_Std_Library/FVP_Base"
 fvp_base_revc_2xaemva="fvp:fvp_base_revc-2xaemva_${model_version}_${model_build};/opt/model/Base_RevC_AEMvA_pkg/models/${model_flavour}"
 fvp_base_aemv8a_gic600ae="fvp:fvp_base_aemv8a-gic600ae_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_Base_AEMv8A-GIC600AE_pkg/models/${model_flavour_11_17}"
-fvp_base_aemv8a_aemv8a_aemv8a_aemv8a_ccn502="fvp:fvp_base_aemv8a-aemv8a-aemv8a-aemv8a-ccn502_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502_pkg/models/${model_flavour_11_17}"
+fvp_base_aemv8a_aemv8a_aemv8a_aemv8a_ccn502="fvp:fvp_base_aemv8a-aemv8a-aemv8a-aemv8a-ccn502_${model_version}_${model_build};/opt/model/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502_pkg/models/${model_flavour}"
 fvp_base_aemv8r="fvp:fvp_base_aemv8r_${model_version}_${model_build};/opt/model/AEMv8R_base_pkg/models/${model_flavour}"
 
 # CSS model list
@@ -93,13 +93,13 @@
 [cortex-a78x4]="${fvp_arm_std_library};FVP_Base_Cortex-A78"
 [cortex-a78aex4]="${fvp_arm_std_library};FVP_Base_Cortex-A78AE"
 [cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78C"
-[cortex-x2]="${fvp_arm_std_library_11_17};FVP_Base_Cortex-X2x4"
-[cortex-a710]="${fvp_arm_std_library_11_17};FVP_Base_Cortex-A710x4"
+[cortex-x2]="${fvp_arm_std_library};FVP_Base_Cortex-X2"
+[cortex-a710]="${fvp_arm_std_library};FVP_Base_Cortex-A710"
 [neoverse_e1x1]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
 [neoverse_e1x2]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
 [neoverse_e1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
 [neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1"
-[neoverse_n2]="${fvp_arm_std_library_11_16};FVP_Base_Neoverse-N1x4"
+[neoverse_n2]="${fvp_arm_std_library};FVP_Base_Neoverse-N2"
 [neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
 [morello]="${fvp_morello};FVP_Morello"
 [css-rdv1]="${fvp_rd_v1};FVP_RD_V1"
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"
 
diff --git a/utils.sh b/utils.sh
index be1fa83..38705d5 100644
--- a/utils.sh
+++ b/utils.sh
@@ -545,19 +545,14 @@
 jenkins_url="${JENKINS_URL%/*}"
 jenkins_url="${jenkins_url:-https://ci.trustedfirmware.org/}"
 
-# 11.16 Model revisions
-model_version_11_16="11.16"
-model_build_11_16="16"
-model_flavour_11_16="Linux64_GCC-6.4"
-
 # 11.17 Model revisions
 model_version_11_17="11.17"
 model_build_11_17="21"
 model_flavour_11_17="Linux64_GCC-9.3"
 
 # Model revisions
-model_version="${model_version:-11.22}"
-model_build="${model_build:-14}"
+model_version="${model_version:-11.26}"
+model_build="${model_build:-11}"
 model_flavour="${model_flavour:-Linux64_GCC-9.3}"
 
 # Model snapshots from filer are not normally not accessible from developer