diff --git a/.github/workflows/toolbox.yml b/.github/workflows/toolbox.yml
index 4c4dc70..dcfbaa7 100644
--- a/.github/workflows/toolbox.yml
+++ b/.github/workflows/toolbox.yml
@@ -38,7 +38,7 @@ jobs:
         uses: dsaltares/fetch-gh-release-asset@master
         with:
           repo: "Open-CMSIS-Pack/devtools"
-          version: tags/tools/buildmgr/2.0.0-dev3
+          version: tags/tools/buildmgr/2.0.0
           file: cbuild_install.sh
           target: toolbox/cbuild/cbuild_install.sh
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docs/progress.md b/docs/progress.md
index f5417a8..10c4ad8 100644
--- a/docs/progress.md
+++ b/docs/progress.md
@@ -73,6 +73,8 @@ support multiple `setup` for each context
 support for standard language options in cbuild                                          | :heavy_check_mark:       | cbuild 2.0.0-dev3
 support for standard language options in csolution                                       | :heavy_check_mark:       | csolution 2.0.0-dev3
 support for `language` and `scope` component file attributes in csolution                | :heavy_check_mark:       | csolution 2.0.0-dev3
+alpha support for LLVM/Clang in cbuild                                                   | :heavy_check_mark:       | cbuild 2.0.0
+alpha support for LLVM/Clang in csolution                                                | :heavy_check_mark:       | csolution 2.0.0
 resources management                                                                     | :x:                      |
 execution groups/phases                                                                  | :x:                      |
 pre/post build steps in csolution                                                        | :x:                      |
diff --git a/test/src/InstallerTests.cpp b/test/src/InstallerTests.cpp
index 2eef9e0..37a1f07 100644
--- a/test/src/InstallerTests.cpp
+++ b/test/src/InstallerTests.cpp
@@ -60,7 +60,7 @@ void ToolBoxInstallerTests::CheckInstallationDir(
                 "AC6.6.18.0.cmake",
                 "ac6_linker_script.sct", "gcc_linker_script.ld", "iar_linker_script.icf",
                 "CPRJ.xsd", "PACK.xsd", "GCC.10.3.1.cmake",
-                //"CLANG.16.0.0.cmake",
+                "CLANG.16.0.0.cmake",
                 "IAR.9.32.1.cmake", "setup",
                 "{{ProjectName}}.cproject.yml",
                 "{{SolutionName}}.csolution.yml",
@@ -107,7 +107,7 @@ void ToolBoxInstallerTests::CheckExtractedDir(const string& path, bool expect) {
                 "AC6.6.18.0.cmake",
                 "ac6_linker_script.sct", "gcc_linker_script.ld", "iar_linker_script.icf",
                 "CPRJ.xsd", "PACK.xsd", "GCC.10.3.1.cmake",
-                //"CLANG.16.0.0.cmake",
+                "CLANG.16.0.0.cmake",
                 "IAR.9.32.1.cmake", "setup",
                 "{{ProjectName}}.cproject.yml",
                 "{{SolutionName}}.csolution.yml",