diff --git a/model/base-aemv8a-latest-revb.sh b/model/base-aemv8a-latest-revb.sh
index 0b8037a..dcd0683 100644
--- a/model/base-aemv8a-latest-revb.sh
+++ b/model/base-aemv8a-latest-revb.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A"
 
 default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 
diff --git a/model/base-aemv8a-quad.sh b/model/base-aemv8a-quad.sh
index 8bf5193..a894678 100644
--- a/model/base-aemv8a-quad.sh
+++ b/model/base-aemv8a-quad.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502"
 
 default_var cluster_0_num_cores 4
 default_var cluster_1_num_cores 4
diff --git a/model/base-aemv8a-revb.sh b/model/base-aemv8a-revb.sh
index 8acf498..fff750b 100644
--- a/model/base-aemv8a-revb.sh
+++ b/model/base-aemv8a-revb.sh
@@ -6,7 +6,7 @@
 #
 
 # Use revb model
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A"
 
 default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 
diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index fca5119..51fa911 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -7,7 +7,7 @@
 
 # Use revc model
 if  is_arm_jenkins_env || upon "$local_ci"; then
-        set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_RevC-2xAEMv8A"
+        set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA"
         default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 else
         # OpenCI enviroment
diff --git a/model/base-aemva.sh b/model/base-aemva.sh
index ebea303..2e681f2 100644
--- a/model/base-aemva.sh
+++ b/model/base-aemva.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_AEMvA"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMvA"
 
 default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 
diff --git a/model/cortex-a32x4.sh b/model/cortex-a32x4.sh
index 1d459c9..abb733c 100644
--- a/model/cortex-a32x4.sh
+++ b/model/cortex-a32x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-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/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A32x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a35x4.sh b/model/cortex-a35x4.sh
index 8415373..6004a3e 100644
--- a/model/cortex-a35x4.sh
+++ b/model/cortex-a35x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A35x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A35x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a53x4.sh b/model/cortex-a53x4.sh
index 80ef1e6..0bd8403 100644
--- a/model/cortex-a53x4.sh
+++ b/model/cortex-a53x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A53x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A53x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a55x4-a75x4.sh b/model/cortex-a55x4-a75x4.sh
index 5ae55ed..acc02af 100644
--- a/model/cortex-a55x4-a75x4.sh
+++ b/model/cortex-a55x4-a75x4.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A55x4+Cortex-A75x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A55x4+Cortex-A75x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a55x4-a76x2.sh b/model/cortex-a55x4-a76x2.sh
index 0e883ff..d2cc861 100644
--- a/model/cortex-a55x4-a76x2.sh
+++ b/model/cortex-a55x4-a76x2.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A55x4+Cortex-A76x2"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A55x4+Cortex-A76x2"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a55x4.sh b/model/cortex-a55x4.sh
index ce9fb1e..2d97a36 100644
--- a/model/cortex-a55x4.sh
+++ b/model/cortex-a55x4.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A55x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A55x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a57x1-a53x1.sh b/model/cortex-a57x1-a53x1.sh
index 853f60d..8420bdf 100644
--- a/model/cortex-a57x1-a53x1.sh
+++ b/model/cortex-a57x1-a53x1.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A57x1-A53x1"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A57x1-A53x1"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a57x2-a53x4.sh b/model/cortex-a57x2-a53x4.sh
index 5386b82..40f2ed9 100644
--- a/model/cortex-a57x2-a53x4.sh
+++ b/model/cortex-a57x2-a53x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A57x2-A53x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A57x2-A53x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a57x4-a53x4.sh b/model/cortex-a57x4-a53x4.sh
index 27203ec..859be7a 100644
--- a/model/cortex-a57x4-a53x4.sh
+++ b/model/cortex-a57x4-a53x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A57x4-A53x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A57x4-A53x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a57x4.sh b/model/cortex-a57x4.sh
index ede51c2..92afe94 100644
--- a/model/cortex-a57x4.sh
+++ b/model/cortex-a57x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A57x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A57x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a65aex8.sh b/model/cortex-a65aex8.sh
index e017626..ab16f01 100644
--- a/model/cortex-a65aex8.sh
+++ b/model/cortex-a65aex8.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A65AEx8"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65AEx8"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a65x4.sh b/model/cortex-a65x4.sh
index dd6a552..1398ca8 100644
--- a/model/cortex-a65x4.sh
+++ b/model/cortex-a65x4.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "/$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A65x4"
+set_model_path "/$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a72x4-a53x4.sh b/model/cortex-a72x4-a53x4.sh
index e988620..1c0951f 100644
--- a/model/cortex-a72x4-a53x4.sh
+++ b/model/cortex-a72x4-a53x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A72x4-A53x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A72x4-A53x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a72x4.sh b/model/cortex-a72x4.sh
index faf5afc..b252ea0 100644
--- a/model/cortex-a72x4.sh
+++ b/model/cortex-a72x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A72x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A72x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a73x4-a53x4.sh b/model/cortex-a73x4-a53x4.sh
index e7b84ce..8aca8d1 100644
--- a/model/cortex-a73x4-a53x4.sh
+++ b/model/cortex-a73x4-a53x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A73x4-A53x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A73x4-A53x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a73x4.sh b/model/cortex-a73x4.sh
index f14fa42..6026929 100644
--- a/model/cortex-a73x4.sh
+++ b/model/cortex-a73x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A73x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A73x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a75x4.sh b/model/cortex-a75x4.sh
index d604d63..56d3e73 100644
--- a/model/cortex-a75x4.sh
+++ b/model/cortex-a75x4.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A75x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A75x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a76aex4.sh b/model/cortex-a76aex4.sh
index b23b3c8..d24bf3b 100644
--- a/model/cortex-a76aex4.sh
+++ b/model/cortex-a76aex4.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A76AEx4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A76AEx4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a76x4.sh b/model/cortex-a76x4.sh
index c1672a7..d30dce4 100644
--- a/model/cortex-a76x4.sh
+++ b/model/cortex-a76x4.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A76x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A76x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a77x4.sh b/model/cortex-a77x4.sh
index 23da644..575dc53 100644
--- a/model/cortex-a77x4.sh
+++ b/model/cortex-a77x4.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A77x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A77x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a78x4.sh b/model/cortex-a78x4.sh
index 0cebfcc..a37851d 100644
--- a/model/cortex-a78x4.sh
+++ b/model/cortex-a78x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A78x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A78x4"
 
 # Option not supported on A78 FVP yet.
 export no_quantum=""
diff --git a/model/css-rde1edge.sh b/model/css-rde1edge.sh
index d129265..fa94a06 100644
--- a/model/css-rde1edge.sh
+++ b/model/css-rde1edge.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_RD_E1_edge"
+set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/external/models/$model_flavour/FVP_RD_E1_edge"
 
 cat <<EOF >"$model_param_file"
 -C board.flashloader0.fname=$fip_bin
diff --git a/model/foundationv8.sh b/model/foundationv8.sh
index f4d2999..bc4e5c3 100644
--- a/model/foundationv8.sh
+++ b/model/foundationv8.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/Foundation_Platform"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/Foundation_Platform"
 
 default_var ncores 4
 default_var quantum 1000
diff --git a/model/matterhornx4.sh b/model/matterhornx4.sh
index 4a5b68b..9571c73 100644
--- a/model/matterhornx4.sh
+++ b/model/matterhornx4.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Matterhornx4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Matterhornx4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/neoverse-v1x4.sh b/model/neoverse-v1x4.sh
index a6cbff3..e512b89 100644
--- a/model/neoverse-v1x4.sh
+++ b/model/neoverse-v1x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Neoverse-V1x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-V1x4"
 
 # Option not supported on Neoverse FVP yet.
 export no_quantum=""
diff --git a/model/neoverse_e1x1.sh b/model/neoverse_e1x1.sh
index 064eb5b..264f86f 100644
--- a/model/neoverse_e1x1.sh
+++ b/model/neoverse_e1x1.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Neoverse-E1x1"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-E1x1"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/neoverse_e1x2.sh b/model/neoverse_e1x2.sh
index c413a05..98df385 100644
--- a/model/neoverse_e1x2.sh
+++ b/model/neoverse_e1x2.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Neoverse-E1x2"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-E1x2"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/neoverse_e1x4.sh b/model/neoverse_e1x4.sh
index 4e165c0..f974547 100644
--- a/model/neoverse_e1x4.sh
+++ b/model/neoverse_e1x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Neoverse-E1x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-E1x4"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/neoverse_n1.sh b/model/neoverse_n1.sh
index 3573a9a..6a1279d 100644
--- a/model/neoverse_n1.sh
+++ b/model/neoverse_n1.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Neoverse-N1x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-N1x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/neoverse_n2.sh b/model/neoverse_n2.sh
index 67cc259..1c3504d 100644
--- a/model/neoverse_n2.sh
+++ b/model/neoverse_n2.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-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/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-N2x4"
 
 source "$ci_root/model/fvp_common.sh"