diff --git a/bionic-amd64-tf-m-build/Dockerfile b/bionic-amd64-tf-m-build/Dockerfile
index 7f50f1e..4478a4e 100644
--- a/bionic-amd64-tf-m-build/Dockerfile
+++ b/bionic-amd64-tf-m-build/Dockerfile
@@ -18,6 +18,8 @@
 ENV GCC_11_2_PATH=${GCC_11_2_DIR}/bin
 ENV ARMCLANG_6_13_DIR=${COMPILER_DIR}/armclang-6-13
 ENV ARMCLANG_6_13_PATH=${ARMCLANG_6_13_DIR}/bin
+ENV ARMCLANG_6_18_DIR=${COMPILER_DIR}/armclang-6-18
+ENV ARMCLANG_6_18_PATH=${ARMCLANG_6_18_DIR}/bin
 ENV PKG_DEPS="\
     bison \
     build-essential \
@@ -69,6 +71,7 @@
 
 # Copy armclang toolchains
 COPY DS500-BN-00026-r5p0-15rel0.tar.gz /tmp/
+COPY ARMCompiler*.tar.gz /tmp/
 
 RUN set -ex ;\
     echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections ;\
diff --git a/bionic-amd64-tf-m-build/build.sh b/bionic-amd64-tf-m-build/build.sh
index 0e7adaa..fe860b2 100755
--- a/bionic-amd64-tf-m-build/build.sh
+++ b/bionic-amd64-tf-m-build/build.sh
@@ -20,6 +20,7 @@
 # Copy armclang toolchains required for the build (previously fetched
 # from s3://trustedfirmware-private/armclang/ by build harness).
 cp ../DS500-BN-00026-r5p0-15rel0.tar.gz .
+cp ../ARMCompiler6.18_standalone_linux-x86_64.tar.gz .
 
 image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}${DOCKER_SUFFIX}
 docker build --pull --tag=$image .
diff --git a/bionic-amd64-tf-m-build/tf-dependencies.install b/bionic-amd64-tf-m-build/tf-dependencies.install
index 7568232..09cf96b 100755
--- a/bionic-amd64-tf-m-build/tf-dependencies.install
+++ b/bionic-amd64-tf-m-build/tf-dependencies.install
@@ -43,3 +43,9 @@
 mkdir -p /tmp/armclang
 tar -xf /tmp/DS500-BN-00026-r5p0-15rel0.tar.gz -C /tmp/armclang
 /tmp/armclang/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${ARMCLANG_6_13_DIR}
+
+# Install Arm Clang v6.18 toolchain to ARMCLANG_6_18_DIR (armclang)
+mkdir -p /tmp/armclang-6.18
+tar -xf /tmp/ARMCompiler6.18_standalone_linux-x86_64.tar.gz -C /tmp/armclang-6.18
+/tmp/armclang/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${ARMCLANG_6_18_DIR}
+