diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh
index 12ae01ec3..631be1909 100644
--- a/images/linux/scripts/installers/clang.sh
+++ b/images/linux/scripts/installers/clang.sh
@@ -12,7 +12,12 @@ function InstallClang {
     version=$1
 
     echo "Installing clang-$version..."
-    apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version"
+    if [[ $version =~ 9 ]]; then
+        ./llvm.sh $version
+        apt-get install -y "clang-format-$version"
+    else
+        apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version"
+    fi
 
     # Run tests to determine that the software installed as expected
     echo "Testing to make sure that script performed as expected, and basic scenarios work"
@@ -28,6 +33,10 @@ function InstallClang {
     DocumentInstalledItem "Clang $version ($(clang-$version --version | head -n 1 | cut -d ' ' -f 3 | cut -d '-' -f 1))"
 }
 
+# Download script for automatic installation
+wget https://apt.llvm.org/llvm.sh
+chmod +x llvm.sh
+
 versions=(
     "6.0"
     "8"
@@ -39,6 +48,8 @@ do
     InstallClang $version
 done
 
+rm llvm.sh
+
 # Make Clang 9 default
 update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 100
 update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 100