diff --git a/jammy-amd64-tf-a-build/build.sh b/jammy-amd64-tf-a-build/build.sh
index 7d9b84a..8089fba 100755
--- a/jammy-amd64-tf-a-build/build.sh
+++ b/jammy-amd64-tf-a-build/build.sh
@@ -19,7 +19,7 @@
 
 # Copy armclang toolchains required for the build (previously fetched
 # from s3://trustedfirmware-private/armclang/ by build harness).
-cp ../ARMCompiler6.18_standalone_linux-x86_64.tar.gz .
+cp ../ARMCompiler6.23_standalone_linux-x86_64.tar.gz .
 
 image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}${DOCKER_SUFFIX}
 docker build --pull --no-cache --tag=$image .
diff --git a/jammy-amd64-tf-a-build/tf-dependencies.install b/jammy-amd64-tf-a-build/tf-dependencies.install
index 26402ba..ce3287b 100755
--- a/jammy-amd64-tf-a-build/tf-dependencies.install
+++ b/jammy-amd64-tf-a-build/tf-dependencies.install
@@ -49,10 +49,10 @@
   https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/clang+llvm-18.1.8-x86_64-linux-gnu-ubuntu-18.04.tar.xz
 tar -xf /tmp/clang+llvm-18.1.8-x86_64-linux-gnu-ubuntu-18.04.tar.xz -C ${TOOLS_DIR} --strip-components=1
 
-# Install Arm Clang 6.18 toolchain (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-6.18/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.18
+# Install Arm Clang 6.23 toolchain (armclang)
+mkdir -p /tmp/armclang-6.23
+tar -xf /tmp/ARMCompiler6.23_standalone_linux-x86_64.tar.gz -C /tmp/armclang-6.23
+/tmp/armclang-6.23/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.23
 
 # Install the CUE data constraint language
 go install cuelang.org/go/cmd/cue@v0.5.0