diff --git a/model/css-rde1edge.sh b/model/css-rde1edge.sh
index fa94a06..393006d 100644
--- a/model/css-rde1edge.sh
+++ b/model/css-rde1edge.sh
@@ -1,21 +1,25 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/external/models/$model_flavour/FVP_RD_E1_edge"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/$model_flavour/FVP_RD_E1_edge"
 
 cat <<EOF >"$model_param_file"
 -C board.flashloader0.fname=$fip_bin
--C board.virtioblockdevice.image_path=$busybox_bin
--C css.cmn600.force_on_from_start=1
+-C css.cmn600.force_rnsam_internal=false
 -C css.cmn600.mesh_config_file=RD_N1_E1_cmn600.yml
+-C css.gic_distributor.ITS-device-bits=20
 -C css.mcp.ROMloader.fname=$mcp_rom_bin
 -C css.pl011_uart_ap.unbuffered_output=1
+-C css.scp.pl011_uart_scp.unbuffered_output=1
 -C css.scp.ROMloader.fname=$scp_rom_bin
 -C css.trustedBootROMloader.fname=$bl1_bin
+-C soc.pl011_uart_mcp.unbuffered_output=1
+-C soc.pl011_uart0.enable_dc4=0
+-C soc.pl011_uart0.flow_ctrl_mask_en=1
 -C soc.pl011_uart0.unbuffered_output=1
 -C soc.pl011_uart1.unbuffered_output=1
 --data css.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
diff --git a/model/css-rdn1edge.sh b/model/css-rdn1edge.sh
index caee1cf..5ac1f7a 100644
--- a/model/css-rdn1edge.sh
+++ b/model/css-rdn1edge.sh
@@ -1,21 +1,25 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.10/36/models/Linux64_GCC-6.4/FVP_RD_N1_edge"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/$model_flavour/FVP_RD_N1_edge"
 
 cat <<EOF >"$model_param_file"
 -C board.flashloader0.fname=$fip_bin
 -C board.virtioblockdevice.image_path=$busybox_bin
--C css.cmn600.force_on_from_start=1
+-C css.cmn600.force_rnsam_internal=false
 -C css.cmn600.mesh_config_file=RD_N1_E1_cmn600.yml
+-C css.gic_distributor.ITS-device-bits=20
 -C css.mcp.ROMloader.fname=$mcp_rom_bin
 -C css.pl011_uart_ap.unbuffered_output=1
+-C css.scp.pl011_uart_scp.unbuffered_output=1
 -C css.scp.ROMloader.fname=$scp_rom_bin
 -C css.trustedBootROMloader.fname=$bl1_bin
+-C soc.pl011_uart0.enable_dc4=0
+-C soc.pl011_uart0.flow_ctrl_mask_en=1
 -C soc.pl011_uart0.unbuffered_output=1
 -C soc.pl011_uart1.unbuffered_output=1
 --data css.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
diff --git a/model/css-rdn1edgex2.sh b/model/css-rdn1edgex2.sh
index 2ebd419..854c756 100644
--- a/model/css-rdn1edgex2.sh
+++ b/model/css-rdn1edgex2.sh
@@ -1,29 +1,43 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.10/36/models/Linux64_GCC-6.4/FVP_RD_N1_edge_dual"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/$model_flavour/FVP_RD_N1_edge_dual"
 
 cat <<EOF >"$model_param_file"
--C css0.cmn600.force_on_from_start=1
--C css0.cmn600.mesh_config_file=RD_N1_E1_cmn600_ccix.yml
--C css0.mcp.ROMloader.fname=$mcp_rom_bin
--C css0.scp.ROMloader.fname=$scp_rom_bin
---data css0.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
--C css0.trustedBootROMloader.fname=$bl1_bin
+
 -C board0.flashloader0.fname=$fip_bin
 -C board0.virtioblockdevice.image_path=$busybox_bin
+-C css0.cmn600.force_rnsam_internal=false
+-C css0.cmn600.mesh_config_file=RD_N1_E1_cmn600.yml
+-C css0.gic_distributor.ITS-device-bits=20
+-C css0.gic_distributor.multichip-threaded-dgi=0
+-C css0.mcp.ROMloader.fname=$mcp_rom_bin
 -C css0.pl011_uart_ap.unbuffered_output=1
+-C css0.scp.pl011_uart_scp.unbuffered_output=1
+-C css0.scp.ROMloader.fname=$scp_rom_bin
+-C css0.trustedBootROMloader.fname=$bl1_bin
+-C css1.cmn600.force_rnsam_internal=false
+-C css1.cmn600.mesh_config_file=RD_N1_E1_cmn600.yml
+-C css1.gic_distributor.ITS-device-bits=20
+-C css1.gic_distributor.multichip-threaded-dgi=0
+-C css1.mcp.ROMloader.fname=$mcp_rom_bin
+-C css1.pl011_uart_ap.unbuffered_output=1
+-C css1.scp.pl011_uart_scp.unbuffered_output=1
+-C css1.scp.ROMloader.fname=$scp_rom_bin
+-C css1.trustedBootROMloader.fname=$bl1_bin
+-C soc0.pl011_uart_mcp.unbuffered_output=1
+-C soc0.pl011_uart0.enable_dc4=0
+-C soc0.pl011_uart0.flow_ctrl_mask_en=1
 -C soc0.pl011_uart0.unbuffered_output=1
 -C soc0.pl011_uart1.unbuffered_output=1
+-C soc1.pl011_uart_mcp.unbuffered_output=1
+-C soc1.pl011_uart0.unbuffered_output=1
+-C soc1.pl011_uart1.unbuffered_output=1
 
--C css1.cmn600.force_on_from_start=1
--C css1.cmn600.mesh_config_file=RD_N1_E1_cmn600_ccix.yml
--C css1.mcp.ROMloader.fname=$mcp_rom_bin
--C css1.scp.ROMloader.fname=$scp_rom_bin
+--data css0.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
 --data css1.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
--C css1.pl011_uart_ap.unbuffered_output=1
 EOF
diff --git a/model/css-rdv1.sh b/model/css-rdv1.sh
index 66c7bb6..8744913 100644
--- a/model/css-rdv1.sh
+++ b/model/css-rdv1.sh
@@ -5,17 +5,23 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.14/34/models/Linux64_GCC-6.4/FVP_RD_V1"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/$model_flavour/FVP_RD_V1"
 
 cat <<EOF >"$model_param_file"
--C css.cmn_650.force_rnsam_internal=true
--C css.mcp.ROMloader.fname=$mcp_rom_bin
--C css.scp.ROMloader.fname=$scp_rom_bin
---data css.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
--C css.trustedBootROMloader.fname=$bl1_bin
 -C board.flashloader0.fname=$fip_bin
 -C board.virtioblockdevice.image_path=$busybox_bin
+-C css.cmn_650.force_rnsam_internal=true
+-C css.cmn_650.mesh_config_file=cmn650_rdv1.yml
+-C css.gic_distributor.ITS-device-bits=20
+-C css.mcp.ROMloader.fname=$mcp_rom_bin
 -C css.pl011_uart_ap.unbuffered_output=1
+-C css.scp.pl011_uart_scp.unbuffered_output=1
+-C css.scp.ROMloader.fname=$scp_rom_bin
+-C css.trustedBootROMloader.fname=$bl1_bin
+-C soc.pl011_uart_mcp.unbuffered_output=1
+-C soc.pl011_uart0.enable_dc4=0
+-C soc.pl011_uart0.flow_ctrl_mask_en=1
 -C soc.pl011_uart0.unbuffered_output=1
 -C soc.pl011_uart1.unbuffered_output=1
+--data css.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr
 EOF
diff --git a/model/css-sgi575.sh b/model/css-sgi575.sh
index 58d3045..adc38e3 100644
--- a/model/css-sgi575.sh
+++ b/model/css-sgi575.sh
@@ -1,21 +1,24 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/SubSystemModels/11.10/36/models/Linux64_GCC-6.4/FVP_CSS_SGI-575"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/$model_flavour/FVP_CSS_SGI-575"
 
 cat <<EOF >"$model_param_file"
 -C board.flashloader0.fname=$fip_bin
 -C board.virtioblockdevice.image_path=$busybox_bin
--C css.cmn600.force_on_from_start=1
+-C css.cmn600.force_rnsam_internal=false
 -C css.cmn600.mesh_config_file=SGI-575_cmn600.yml
+-C css.gic_distributor.ITS-device-bits=20
 -C css.mcp.ROMloader.fname=$mcp_rom_bin
 -C css.pl011_uart_ap.unbuffered_output=1
 -C css.scp.ROMloader.fname=$scp_rom_bin
 -C css.trustedBootROMloader.fname=$bl1_bin
+-C soc.pl011_uart_mcp.unbuffered_output=1
+-C soc.pl011_uart0.enable_dc4=0
 -C soc.pl011_uart0.unbuffered_output=1
 -C soc.pl011_uart1.unbuffered_output=1
 --data css.scp.armcortexm7ct=$scp_ram_bin@$scp_ram_addr