diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
index 756f1aa23a..eb9d0f9339 100644
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -1,4 +1,4 @@
-name: clang-format
+name: clang-format-16
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
@@ -28,6 +28,6 @@ jobs:
       - name: Run clang-format style check for C/C++ programs.
         uses: jidicula/clang-format-action@v4.4.1
         with:
-          clang-format-version: "11"
+          clang-format-version: "16"
           check-path: ${{ matrix.path['check'] }}
           exclude-regex: ${{ matrix.path['exclude'] }}
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 5285c28e23..13098bdff7 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -84,7 +84,6 @@ jobs:
   #       working-directory: ${{runner.workspace}}/build
   #       run: cpack -C ${{ env.BUILD_TYPE }}
 
-  # TODO: Some day add support for building on macOS with any modern LLVM version, not just LLVM-8.
   #
   # build-macos:
   #   runs-on: macos-latest
@@ -140,7 +139,7 @@ jobs:
         run: sudo apt-get update
 
       - name: Install Dependencies
-        run: sudo apt-get install -y llvm-8-dev clang-8 clamav # TODO: use just 'llvm-dev' when we can support any recent LLVM version.
+        run: sudo apt-get install -y llvm-16-dev clang-16 clamav # TODO: use just 'llvm-dev' when we can support any recent LLVM version.
 
       - name: Install pytest for easier to read test results
         run: python3 -m pip install pytest