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"
diff --git a/run_config/fvp-aemv8a.aarch32.gicv2 b/run_config/fvp-aemv8a.aarch32.gicv2
index 67ca943..ddddcab 100644
--- a/run_config/fvp-aemv8a.aarch32.gicv2
+++ b/run_config/fvp-aemv8a.aarch32.gicv2
@@ -1,6 +1,6 @@
 #!/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
 #
@@ -10,6 +10,7 @@
 
 	model_version="0.0" \
 	model_build="6557" \
+	model_flavour="Linux64_GCC-6.4" \
 	mpidr_layout="0" \
 	supports_multi_threading="0" \
 	gicv3_gicv2_only="1" cache_state_modelled=0 model="$model" aarch32="1" gen_model_params
@@ -17,5 +18,6 @@
 	#ToDo: switch to aarch32.gicv2 based RevC model once it is available publicly
 	model_version="11.14" \
 	model_build="21" \
+	model_flavour="Linux64_GCC-6.4" \
 	model="base-aemv8a-revb" gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemva.ete_trace_ext b/run_config/fvp-aemva.ete_trace_ext
index a910998..5e96207 100644
--- a/run_config/fvp-aemva.ete_trace_ext
+++ b/run_config/fvp-aemva.ete_trace_ext
@@ -1,6 +1,6 @@
 #!/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
 #
@@ -10,6 +10,7 @@
 
 	model_version="0.0" \
 	model_build="6684" \
+	model_flavour="Linux64_GCC-6.4" \
 	etm_present="1" \
 	ete_plugin="1" \
 	supports_trace_buffer_control_regs="1" \
diff --git a/run_config/fvp-aemva.ete_trace_ext.bl31_panic b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
index eae33e8..48d2de9 100644
--- a/run_config/fvp-aemva.ete_trace_ext.bl31_panic
+++ b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
@@ -1,6 +1,6 @@
 #!/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
 #
@@ -10,6 +10,7 @@
 
 	model_version="0.0" \
 	model_build="6684" \
+	model_flavour="Linux64_GCC-6.4" \
 	etm_present="1" \
 	ete_plugin="1" \
 	supports_trace_buffer_control_regs="1" \
diff --git a/run_config/fvp-cortexa32x4 b/run_config/fvp-cortexa32x4
index 13abfef..42a9a65 100644
--- a/run_config/fvp-cortexa32x4
+++ b/run_config/fvp-cortexa32x4
@@ -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
 #
@@ -9,8 +9,6 @@
         local model="cortex-a32x4"
 
 	model="$model" \
-	model_version="11.12" \
-	model_build="38" \
 	gen_model_params
 	uart="0" set_expect_variable "num_cpus" "4"
 
diff --git a/run_config/fvp-cortexa32x4.rstspmin b/run_config/fvp-cortexa32x4.rstspmin
index 0e973c5..0455cb0 100644
--- a/run_config/fvp-cortexa32x4.rstspmin
+++ b/run_config/fvp-cortexa32x4.rstspmin
@@ -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
 #
@@ -10,9 +10,8 @@
 
 	reset_to_spmin="1" \
 	model="$model" \
-	model_version="11.12" \
-	model_build="38" \
 	gen_model_params
 	uart="0" set_expect_variable "num_cpus" "4"
+
 	model="$model" gen_fvp_yaml
 }
diff --git a/run_config/fvp-morello b/run_config/fvp-morello
index ad81c51..1c8ad96 100644
--- a/run_config/fvp-morello
+++ b/run_config/fvp-morello
@@ -15,6 +15,7 @@
 	model="morello" \
 	model_version="0.11" \
 	model_build="33" \
+	model_flavour="Linux64_GCC-6.4" \
 	gen_model_params
 	set_run_env "ports_script" "$ci_root/model/morello-ports.awk"
 	set_run_env "num_uarts" "3"
diff --git a/run_config/fvp-neoverse_n2x4 b/run_config/fvp-neoverse_n2x4
index ffdeaa0..a435b07 100644
--- a/run_config/fvp-neoverse_n2x4
+++ b/run_config/fvp-neoverse_n2x4
@@ -1,6 +1,6 @@
 #!/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
 #
@@ -9,8 +9,6 @@
         local model="neoverse_n2"
 
 	model="$model" \
-	model_version="11.12" \
-	model_build="38" \
 	cache_state_modelled="0" \
 	gen_model_params
 	uart="0" set_expect_variable "num_cpus" "4"
diff --git a/utils.sh b/utils.sh
index 20ee96f..182d745 100644
--- a/utils.sh
+++ b/utils.sh
@@ -306,9 +306,9 @@
 model_flavour_11_12="Linux64_GCC-6.4"
 
 # Model revisions
-model_version="${model_version:-11.16}"
-model_build="${model_build:-16}"
-model_flavour="${model_flavour:-Linux64_GCC-6.4}"
+model_version="${model_version:-11.17}"
+model_build="${model_build:-21}"
+model_flavour="${model_flavour:-Linux64_GCC-9.3}"
 
 # Model snapshots from filer are not normally not accessible from developer
 # systems. Ignore failures from picking real path for local runs.