diff --git a/model/css-rdv1.sh b/model/css-rdv1.sh
index da28805..29f0258 100644
--- a/model/css-rdv1.sh
+++ b/model/css-rdv1.sh
@@ -1,17 +1,14 @@
 #!/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
 #
 
-# Tell FVP to use RNSAMs as internal in CMN-Rhodes.
-set_model_env "FASTSIM_CMN_INTERNAL_RNSAM" "1"
-
-set_model_path "$warehouse/SysGen/SubSystemModels/11.10/36/models/Linux64_GCC-6.4/FVP_RD_Daniel"
+set_model_path "$warehouse/SysGen/SubSystemModels/11.13/10/models/Linux64_GCC-6.4/FVP_RD_Daniel"
 
 cat <<EOF >"$model_param_file"
--C css.cmn_rhodes.force_on_from_start=1
+-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
diff --git a/rdv1_utils.sh b/rdv1_utils.sh
index 4d16194..69fedc8 100644
--- a/rdv1_utils.sh
+++ b/rdv1_utils.sh
@@ -1,6 +1,6 @@
 #!/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
 #
@@ -9,8 +9,7 @@
 
 sgi_prebuilts="${sgi_prebuilts:-$css_downloads/sgi/rdv1}"
 
-# Pre-built SCP/MCP v2.7.0 release binaries
-scp_mcp_prebuilts="${scp_mcp_prebuilts:-$css_downloads_270/sgi/rdv1}"
+scp_mcp_prebuilts="$sgi_prebuilts"
 
 fvp_kernels[fvp-sgi-busybox]="$sgi_prebuilts/Image"
 fvp_initrd_urls[fvp-sgi-ramdisk]="$sgi_prebuilts/ramdisk-busybox.img"