diff --git a/fvp_utils.sh b/fvp_utils.sh
index 012f20a..081491a 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -45,6 +45,8 @@
 default_model_dtb="dtb.bin"
 
 # FVP containers and model paths
+fvp_arm_std_library_11_24="fvp:fvp_arm_std_library_${model_version_11_24}_${model_build_11_24};/opt/model/FVP_ARM_Std_Library/FVP_Base"
+
 fvp_arm_std_library="fvp:fvp_arm_std_library_${model_version}_${model_build};/opt/model/FVP_ARM_Std_Library/FVP_Base"
 fvp_base_revc_2xaemva="fvp:fvp_base_revc-2xaemva_${model_version}_${model_build};/opt/model/Base_RevC_AEMvA_pkg/models/${model_flavour}"
 fvp_base_aemv8r="fvp:fvp_base_aemv8r_${model_version}_${model_build};/opt/model/AEMv8R_base_pkg/models/${model_flavour}"
@@ -75,8 +77,8 @@
 [cortex-a57x2-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x2-A53x4"
 [cortex-a57x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4"
 [cortex-a57x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4-A53x4"
-[cortex-a65aex8]="${fvp_arm_std_library};FVP_Base_Cortex-A65AE"
-[cortex-a65x4]="${fvp_arm_std_library};FVP_Base_Cortex-A65"
+[cortex-a65aex8]="${fvp_arm_std_library_11_24};FVP_Base_Cortex-A65AE"
+[cortex-a65x4]="${fvp_arm_std_library_11_24};FVP_Base_Cortex-A65"
 [cortex-a72x4]="${fvp_arm_std_library};FVP_Base_Cortex-A72x4"
 [cortex-a72x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A72x4-A53x4"
 [cortex-a73x4]="${fvp_arm_std_library};FVP_Base_Cortex-A73x4"
@@ -91,9 +93,9 @@
 [cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78C"
 [cortex-x2]="${fvp_arm_std_library};FVP_Base_Cortex-X2"
 [cortex-a710]="${fvp_arm_std_library};FVP_Base_Cortex-A710"
-[neoverse_e1x1]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
-[neoverse_e1x2]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
-[neoverse_e1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
+[neoverse_e1x1]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
+[neoverse_e1x2]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
+[neoverse_e1x4]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
 [neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1"
 [neoverse_n2]="${fvp_arm_std_library};FVP_Base_Neoverse-N2"
 [neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
diff --git a/model/cortex-a65aex8.sh b/model/cortex-a65aex8.sh
index aee5caf..babd4c9 100644
--- a/model/cortex-a65aex8.sh
+++ b/model/cortex-a65aex8.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65AE"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Cortex-A65AE"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/cortex-a65x4.sh b/model/cortex-a65x4.sh
index 12dea94..5f24cd1 100644
--- a/model/cortex-a65x4.sh
+++ b/model/cortex-a65x4.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "/$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65"
+set_model_path "/$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Cortex-A65"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/neoverse_e1x1.sh b/model/neoverse_e1x1.sh
index 4631db5..4cce9ac 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/external/models/$model_flavour/FVP_Base_Neoverse-E1"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Neoverse-E1"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/neoverse_e1x2.sh b/model/neoverse_e1x2.sh
index 97b17c2..f3ae22b 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/external/models/$model_flavour/FVP_Base_Neoverse-E1"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Neoverse-E1"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/neoverse_e1x4.sh b/model/neoverse_e1x4.sh
index d90d230..9f6b24c 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/external/models/$model_flavour/FVP_Base_Neoverse-E1"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Neoverse-E1"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/utils.sh b/utils.sh
index 6f57764..1113d9c 100644
--- a/utils.sh
+++ b/utils.sh
@@ -543,6 +543,9 @@
 jenkins_url="${jenkins_url:-https://ci.trustedfirmware.org/}"
 
 # Model revisions
+model_version_11_24="${model_version:-11.24}"
+model_build_11_24="${model_build:-24}"
+
 model_version="${model_version:-11.26}"
 model_build="${model_build:-11}"
 model_flavour="${model_flavour:-Linux64_GCC-9.3}"