diff --git a/fvp_utils.sh b/fvp_utils.sh
index c159c8b..3577657 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -84,7 +84,7 @@
 [neoverse_e1x2]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x2"
 [neoverse_e1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x4"
 [neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1x4"
-[neoverse_n2]=";;;"
+[neoverse_n2]="${fvp_arm_std_library_11_12};FVP_Base_Neoverse-N1x4"
 [neoverse-v1x4]=";;;"
 [cortexa710x4]=";;;"
 [css-rdv1]=";;;"
diff --git a/model/cortex-a32x4.sh b/model/cortex-a32x4.sh
index 1d459c9..5483c6a 100644
--- a/model/cortex-a32x4.sh
+++ b/model/cortex-a32x4.sh
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+# model_version, model_build set in post_fetch_tf_resource
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A32x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/morello.sh b/model/morello.sh
index cc78c9c..92e05a6 100644
--- a/model/morello.sh
+++ b/model/morello.sh
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+# model_version, model_build set in post_fetch_tf_resource
 set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_Morello"
 
 cat <<EOF >"$model_param_file"
diff --git a/model/neoverse_n2.sh b/model/neoverse_n2.sh
index 67cc259..7a9f380 100644
--- a/model/neoverse_n2.sh
+++ b/model/neoverse_n2.sh
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+# model_version, model_build set in post_fetch_tf_resource
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Neoverse-N2x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/tc0.sh b/model/tc0.sh
index bc72115..1f0ae7c 100644
--- a/model/tc0.sh
+++ b/model/tc0.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/0.0/6509/models/$model_flavour/FVP_TC0"
+set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC0"
 
 cat <<EOF >"$model_param_file"
 ${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}
diff --git a/model/tc1.sh b/model/tc1.sh
index e3deb8c..dc184de 100644
--- a/model/tc1.sh
+++ b/model/tc1.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/20/models/$model_flavour/FVP_TC1"
+set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC1"
 
 cat <<EOF >"$model_param_file"
 ${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}
diff --git a/run_config/fvp-morello b/run_config/fvp-morello
index 51f3341..002f242 100644
--- a/run_config/fvp-morello
+++ b/run_config/fvp-morello
@@ -15,8 +15,8 @@
 	local model="morello"
 
 	model="morello" \
-	model_version="0.10" \
-	model_build="542" \
+	model_version="0.11" \
+	model_build="19" \
 	gen_model_params
 	set_run_env "ports_script" "$ci_root/model/morello-ports.awk"
 	set_run_env "num_uarts" "3"
diff --git a/utils.sh b/utils.sh
index 8c7170b..1a4e29b 100644
--- a/utils.sh
+++ b/utils.sh
@@ -306,8 +306,8 @@
 model_flavour_11_12="Linux64_GCC-6.4"
 
 # Model revisions
-model_version="${model_version:-11.15}"
-model_build="${model_build:-14}"
+model_version="${model_version:-11.16}"
+model_build="${model_build:-16}"
 model_flavour="${model_flavour:-Linux64_GCC-6.4}"
 
 # Model snapshots from filer are not normally not accessible from developer