diff --git a/jammy-amd64-tf-a-build/Dockerfile b/jammy-amd64-tf-a-build/Dockerfile
index 0cb7488..9705ecd 100644
--- a/jammy-amd64-tf-a-build/Dockerfile
+++ b/jammy-amd64-tf-a-build/Dockerfile
@@ -11,7 +11,6 @@
     bc \
     bison \
     build-essential \
-    clang \
     llvm \
     clang-tools \
     cpio \
@@ -60,6 +59,7 @@
     virtualenv \
     wget \
     zip \
+    libncurses5 \
 "
 
 # Can be overriden at build time
diff --git a/jammy-amd64-tf-a-build/tf-dependencies.install b/jammy-amd64-tf-a-build/tf-dependencies.install
index dc817db..271b5b9 100755
--- a/jammy-amd64-tf-a-build/tf-dependencies.install
+++ b/jammy-amd64-tf-a-build/tf-dependencies.install
@@ -44,6 +44,11 @@
   https://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/aarch64-linux-gnu/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz
 tar -Jxf /tmp/gcc-linaro-x86_64_aarch64-linux-gnu.tar.xz -C ${TOOLS_DIR}
 
+# Install LLVM Clang toolchain (clang)
+curl --connect-timeout 5 --retry 5 --create-dirs -fsSLo /tmp/clang+llvm-18.1.8-x86_64-linux-gnu-ubuntu-18.04.tar.xz \
+  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