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}