diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh
index c81cfd2a3..377a3607f 100644
--- a/images/linux/scripts/installers/clang.sh
+++ b/images/linux/scripts/installers/clang.sh
@@ -12,11 +12,11 @@ function InstallClang {
     local version=$1
 
     echo "Installing clang-$version..."
-    if [[ $version =~ (9|10) ]]; then
+    if [[ $version =~ 9 ]] && isUbuntu16; 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"
+        apt-get install -y "clang-$version" "lldb-$version" "lld-$version" apt-get install -y "clang-format-$version"
     fi
 
     # Run tests to determine that the software installed as expected