diff --git a/model/base-aemv8a-gic600ae.sh b/model/base-aemv8a-gic600ae.sh
index 7e83038..cdf5608 100644
--- a/model/base-aemv8a-gic600ae.sh
+++ b/model/base-aemv8a-gic600ae.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2021, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022, 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_AEMv8A-GIC600AE"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_AEMv8A-GIC600AE"
 
 default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/0.0/6415/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 
diff --git a/model/base-aemv8a-latest-revb.sh b/model/base-aemv8a-latest-revb.sh
index dcd0683..cbcbcdf 100644
--- a/model/base-aemv8a-latest-revb.sh
+++ b/model/base-aemv8a-latest-revb.sh
@@ -1,11 +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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMvA-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/base-aemv8a-quad.sh b/model/base-aemv8a-quad.sh
index ee00815..1401332 100644
--- a/model/base-aemv8a-quad.sh
+++ b/model/base-aemv8a-quad.sh
@@ -1,11 +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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/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 fff750b..2f9a24d 100644
--- a/model/base-aemv8a-revb.sh
+++ b/model/base-aemv8a-revb.sh
@@ -1,12 +1,12 @@
 #!/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
 #
 
 # Use revb model
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMvA-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/base-aemva.sh b/model/base-aemva.sh
index 6a5e956..ef356cc 100644
--- a/model/base-aemva.sh
+++ b/model/base-aemva.sh
@@ -1,6 +1,6 @@
 #!/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
 #
@@ -11,7 +11,7 @@
 
 default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
 
-default_var ete_plugin_path "$warehouse/SysGen/ETE/0.0/79/external/lib/Linux64_GCC-6.4/libete-plugin.so"
+default_var ete_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/libete-plugin.so"
 
 default_var is_dual_cluster 0
 
diff --git a/model/cortex-a55x4.sh b/model/cortex-a55x4.sh
index 2d97a36..53c5f9e 100644
--- a/model/cortex-a55x4.sh
+++ b/model/cortex-a55x4.sh
@@ -1,10 +1,10 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A55x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A55"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a65aex8.sh b/model/cortex-a65aex8.sh
index ab16f01..63cf3e5 100644
--- a/model/cortex-a65aex8.sh
+++ b/model/cortex-a65aex8.sh
@@ -1,10 +1,10 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65AEx8"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/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 1398ca8..bf37456 100644
--- a/model/cortex-a65x4.sh
+++ b/model/cortex-a65x4.sh
@@ -1,10 +1,10 @@
 #!/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
 #
 
-set_model_path "/$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65x4"
+set_model_path "/$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a710.sh b/model/cortex-a710.sh
index 29d5978..bdea36b 100644
--- a/model/cortex-a710.sh
+++ b/model/cortex-a710.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022 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-A710x4"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_Cortex-A710x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a75x4.sh b/model/cortex-a75x4.sh
index 56d3e73..887d176 100644
--- a/model/cortex-a75x4.sh
+++ b/model/cortex-a75x4.sh
@@ -1,10 +1,10 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A75x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A75"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a76aex4.sh b/model/cortex-a76aex4.sh
index d24bf3b..7fddd52 100644
--- a/model/cortex-a76aex4.sh
+++ b/model/cortex-a76aex4.sh
@@ -1,10 +1,10 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A76AEx4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A76AE"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a76x4.sh b/model/cortex-a76x4.sh
index d30dce4..222da1f 100644
--- a/model/cortex-a76x4.sh
+++ b/model/cortex-a76x4.sh
@@ -1,10 +1,10 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A76x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A76"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a77x4.sh b/model/cortex-a77x4.sh
index 575dc53..7fb0f3e 100644
--- a/model/cortex-a77x4.sh
+++ b/model/cortex-a77x4.sh
@@ -1,10 +1,10 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A77x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A77"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a78cx4.sh b/model/cortex-a78cx4.sh
index db56fcd..4030ffc 100644
--- a/model/cortex-a78cx4.sh
+++ b/model/cortex-a78cx4.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-A78Cx4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A78C"
 
 # Option not supported on A78C FVP yet.
 export no_quantum=""
diff --git a/model/cortex-a78x4.sh b/model/cortex-a78x4.sh
index a37851d..e1bf704 100644
--- a/model/cortex-a78x4.sh
+++ b/model/cortex-a78x4.sh
@@ -1,11 +1,11 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A78x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A78"
 
 # Option not supported on A78 FVP yet.
 export no_quantum=""
diff --git a/model/cortex-x2.sh b/model/cortex-x2.sh
index 8d4bda9..741d609 100644
--- a/model/cortex-x2.sh
+++ b/model/cortex-x2.sh
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-X2x4"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_Cortex-X2x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index f9ce3a8..19a06a3 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -26,6 +26,7 @@
 reset_var secure_memory
 reset_var secure_ram_fill
 reset_var wait_debugger
+reset_var cluster_0_num_cores
 
 
 if [ "$bl2_at_el3" ]; then
@@ -52,6 +53,8 @@
 
 ${bl2_at_el3+--data ${data_instance}=$bl2_bin@${bl2_addr:?}}
 
+${cluster_0_num_cores+-C cluster0.NUM_CORES=$cluster_0_num_cores}
+
 ${reset_to_bl31+--data ${data_instance}=$bl31_bin@${bl31_addr:?}}
 ${preload_bl33+--data ${data_instance}=$preload_bl33_bin@${bl33_addr:?}}
 
diff --git a/model/neoverse-v1x4.sh b/model/neoverse-v1x4.sh
index e512b89..7314f5a 100644
--- a/model/neoverse-v1x4.sh
+++ b/model/neoverse-v1x4.sh
@@ -1,11 +1,11 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-V1x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-V1"
 
 # Option not supported on Neoverse FVP yet.
 export no_quantum=""
diff --git a/model/neoverse_e1x1.sh b/model/neoverse_e1x1.sh
index 264f86f..0589397 100644
--- a/model/neoverse_e1x1.sh
+++ b/model/neoverse_e1x1.sh
@@ -1,11 +1,11 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-E1x1"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/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 98df385..97b17c2 100644
--- a/model/neoverse_e1x2.sh
+++ b/model/neoverse_e1x2.sh
@@ -1,11 +1,11 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-E1x2"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/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 f974547..d90d230 100644
--- a/model/neoverse_e1x4.sh
+++ b/model/neoverse_e1x4.sh
@@ -1,11 +1,11 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-E1x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-E1"
 
 source "$ci_root/model/fvp_common.sh"
 
diff --git a/model/neoverse_n1.sh b/model/neoverse_n1.sh
index 6a1279d..be30173 100644
--- a/model/neoverse_n1.sh
+++ b/model/neoverse_n1.sh
@@ -1,10 +1,10 @@
 #!/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
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-N1x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-N1"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/neoverse_n2.sh b/model/neoverse_n2.sh
index 9ccd124..0722535 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_11_12/$model_build_11_12/models/$model_flavour_11_12/FVP_Base_Neoverse-N2x4"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_16/$model_build_11_16/external/models/$model_flavour_11_16/FVP_Base_Neoverse-N1x4"
 
 source "$ci_root/model/fvp_common.sh"
diff --git a/model/tc2.sh b/model/tc2.sh
index 5b6e4b4..1bd85a9 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"
+set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC2_RSS"
 
 cat <<EOF >"$model_param_file"
 ${fip_bin+-C board.flashloader0.fname=$fip_bin}