diff --git a/model/cortex-a32x4.sh b/model/cortex-a32x4.sh
index 5483c6a..d7a331c 100644
--- a/model/cortex-a32x4.sh
+++ b/model/cortex-a32x4.sh
@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
 #
 # 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"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_12/$model_build_11_12/models/$model_flavour_11_12/FVP_Base_Cortex-A32x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/css-rde1edge.sh b/model/css-rde1edge.sh
index 393006d..c0bde09 100644
--- a/model/css-rde1edge.sh
+++ b/model/css-rde1edge.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/$model_flavour/FVP_RD_E1_edge"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_RD_E1_edge"
 
 cat <<EOF >"$model_param_file"
 -C board.flashloader0.fname=$fip_bin
diff --git a/model/css-rdn1edge.sh b/model/css-rdn1edge.sh
index 0ee16f0..c9084c0 100644
--- a/model/css-rdn1edge.sh
+++ b/model/css-rdn1edge.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/$model_flavour/FVP_RD_N1_edge"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_RD_N1_edge"
 
 cat <<EOF >"$model_param_file"
 -C board.flashloader0.fname=$fip_bin
diff --git a/model/css-rdn1edgex2.sh b/model/css-rdn1edgex2.sh
index 854c756..86a7e69 100644
--- a/model/css-rdn1edgex2.sh
+++ b/model/css-rdn1edgex2.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/$model_flavour/FVP_RD_N1_edge_dual"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_RD_N1_edge_dual"
 
 cat <<EOF >"$model_param_file"
 
diff --git a/model/css-rdv1.sh b/model/css-rdv1.sh
index a3956ed..bc807eb 100644
--- a/model/css-rdv1.sh
+++ b/model/css-rdv1.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/$model_flavour/FVP_RD_V1"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_RD_V1"
 
 cat <<EOF >"$model_param_file"
 -C board.flashloader0.fname=$fip_bin
diff --git a/model/css-sgi575.sh b/model/css-sgi575.sh
index 981406e..873baba 100644
--- a/model/css-sgi575.sh
+++ b/model/css-sgi575.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/$model_flavour/FVP_CSS_SGI-575"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_CSS_SGI-575"
 
 cat <<EOF >"$model_param_file"
 -C board.flashloader0.fname=$fip_bin
diff --git a/model/morello.sh b/model/morello.sh
index 9743bcf..7933f0a 100644
--- a/model/morello.sh
+++ b/model/morello.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-# model_version, model_build set in post_fetch_tf_resource
+# Specific model version is 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 7a9f380..9ccd124 100644
--- a/model/neoverse_n2.sh
+++ b/model/neoverse_n2.sh
@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2020 Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022 Arm Limited. All rights reserved.
 #
 # 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"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_12/$model_build_11_12/models/$model_flavour_11_12/FVP_Base_Neoverse-N2x4"
 
 source "$ci_root/model/fvp_common.sh"