diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh
index 4e8ff01f1..87d1adc5c 100644
--- a/images/linux/scripts/installers/clang.sh
+++ b/images/linux/scripts/installers/clang.sh
@@ -12,7 +12,7 @@ function InstallClang {
     local version=$1
 
     echo "Installing clang-$version..."
-    if [[ $version =~ 9 ]] && isUbuntu16; then
+    if [[ $version =~ 9 ]] && isUbuntu16 || [[ $version =~ 12 ]]; then
         ./llvm.sh $version
         apt-get install -y "clang-format-$version"
     else
@@ -43,4 +43,4 @@ done
 SetDefaultClang $default_clang_version
 rm llvm.sh
 
-invoke_tests "Tools" "clang"
\ No newline at end of file
+invoke_tests "Tools" "clang"
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index b76853106..efabd165a 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -247,7 +247,8 @@
         "versions": [
             "9",
             "10",
-            "11"
+            "11",
+            "12"
         ],
         "default_version": "10"
     },