diff --git a/fvp_utils.sh b/fvp_utils.sh
index 4a4879c..e2a1595 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -9,7 +9,7 @@
 
 bl1_addr="${bl1_addr:-0x0}"
 bl31_addr="${bl31_addr:-0x04001000}"
-bl32_addr="${bl32_addr:-0x04002000}"
+bl32_addr="${bl32_addr:-0x04003000}"
 bl33_addr="${bl33_addr:-0x88000000}"
 dtb_addr="${dtb_addr:-0x82000000}"
 fip_addr="${fip_addr:-0x08000000}"
@@ -51,7 +51,6 @@
 [default]="$linaro_release/fvp-latest-busybox-uboot/ramdisk.img"
 )
 
-# FIXME use optee pre-built binaries
 get_optee_bin() {
 	url="$jenkins_url/job/tf-optee-build/PLATFORM_FLAVOR=fvp,label=arch-dev/lastSuccessfulBuild/artifact/artefacts/tee.bin" \
                saveas="bl32.bin" fetch_file
diff --git a/tc0_utils.sh b/tc0_utils.sh
new file mode 100644
index 0000000..7fe37e1
--- /dev/null
+++ b/tc0_utils.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+source "$ci_root/fvp_utils.sh"
+
+tc_prebuilts="${tc_prebuilts:-$tfa_downloads/total_compute/tc0}"
+
+fvp_kernels[fvp-tc-kernel]="$tc_prebuilts/Image"
+fvp_initrd_urls[fvp-tc-ramdisk]="$tc_prebuilts/uInitrd-busybox.0x88000000"
+
+initrd_addr=0x8000000
+kernel_addr=0x80000
+scp_ram_addr=0x0bd80000