diff --git a/model/css-rdv1.sh b/model/css-rdv1.sh
index 0967635..534ab97 100644
--- a/model/css-rdv1.sh
+++ b/model/css-rdv1.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.17/33/models/$model_flavour/FVP_RD_V1"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.17/29/models/$model_flavour/FVP_RD_V1"
 
 cat <<EOF >"$model_param_file"
 -C board.flashloader0.fname=$fip_bin
diff --git a/model/tc0.sh b/model/tc0.sh
index 4b0c8bc..b05463f 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/$model_version/$model_build/models/$model_flavour/FVP_TC0"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.17/18/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 8ba4129..0434d2c 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/$model_version/$model_build/models/$model_flavour/FVP_TC1"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.17/33/models/$model_flavour/FVP_TC1"
 
 cat <<EOF >"$model_param_file"
 ${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}
diff --git a/model/tc2.sh b/model/tc2.sh
index 1bd85a9..67a59d6 100644
--- a/model/tc2.sh
+++ b/model/tc2.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC2_RSS"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.18/28/models/$model_flavour/FVP_TC2"
 
 cat <<EOF >"$model_param_file"
 ${fip_bin+-C board.flashloader0.fname=$fip_bin}