diff --git a/jammy-amd64-tf-a-build/tf-dependencies.install b/jammy-amd64-tf-a-build/tf-dependencies.install
index 60ee7dc..d4a6244 100755
--- a/jammy-amd64-tf-a-build/tf-dependencies.install
+++ b/jammy-amd64-tf-a-build/tf-dependencies.install
@@ -44,20 +44,26 @@
   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 Arm Clang 6.8 toolchain (armclang)
+# 2022-11-11: No longer available at Arm download page
+## Install Arm Clang 6.8 toolchain (armclang)
+## NOTE: Toolchain is not available through PATH so to use it, CC should point to
+## CC=${TOOLS_DIR}/armclang-6.8/bin/armclang
+#mkdir -p /tmp/armclang-6.8
+#wget -O /tmp/DS500-BN-00026-r5p0-10rel0.tgz \
+#  -q https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-10rel0.tgz
+#tar -xf /tmp/DS500-BN-00026-r5p0-10rel0.tgz -C /tmp/armclang-6.8
+#/tmp/armclang-6.8/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.8
+
+# Install Arm Clang 6.9 toolchain (armclang)
 # NOTE: Toolchain is not available through PATH so to use it, CC should point to
-# CC=${TOOLS_DIR}/armclang-6.8/bin/armclang
-mkdir -p /tmp/armclang-6.8
-wget -O /tmp/DS500-BN-00026-r5p0-10rel0.tgz \
-  -q https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-10rel0.tgz
-tar -xf /tmp/DS500-BN-00026-r5p0-10rel0.tgz -C /tmp/armclang-6.8
-/tmp/armclang-6.8/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.8
+# CC=${TOOLS_DIR}/armclang-6.9/bin/armclang
+mkdir -p /tmp/armclang-6.9
+tar -xf /tmp/DS500-BN-00026-r5p0-11rel0.tar.gz -C /tmp/armclang-6.9
+/tmp/armclang-6.9/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.9
 
 # Install Arm Clang 6.13 (armclang)
 mkdir -p /tmp/armclang-6.13
-wget -O /tmp/DS500-BN-00026-r5p0-15rel0.tgz \
-  -q https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-15rel0.tgz
-tar -xf /tmp/DS500-BN-00026-r5p0-15rel0.tgz -C /tmp/armclang-6.13
+tar -xf /tmp/DS500-BN-00026-r5p0-15rel0.tar.gz -C /tmp/armclang-6.13
 /tmp/armclang-6.13/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}
 
 # Install LLVM Clang toolchain (clang)