diff --git a/.github/workflows/verible-ci.yml b/.github/workflows/verible-ci.yml
index a8821ad7a..39cec9977 100644
--- a/.github/workflows/verible-ci.yml
+++ b/.github/workflows/verible-ci.yml
@@ -501,6 +501,13 @@ jobs:
         choco install bazel --force --version=6.4.0
         choco install winflexbison3
 
+    - name: Workaround C++ clang
+      run: |
+        clang --version
+        choco upgrade llvm
+        # $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' }) -join ';'
+        clang --version
+
     - name: Debug bazel directory settings
       # We need to explicitly call the bazel binary from choco, otherwise
       # the default Windows runner seems to run bazelisk(?) and downloads the