diff --git a/.bazelrc b/.bazelrc
index c2a420aa0..56bced895 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -21,7 +21,8 @@ common:macos --features=-supports_dynamic_linker --linkopt=-framework --linkopt=
 # Force the use clang-cl on Windows instead of MSVC. MSVC has some issues with
 # the codebase, so we focus the effort for now is to have a Windows Verible
 # compiled with clang-cl before fixing the issues unique to MSVC.
-common:windows --compiler=clang-cl --cxxopt=/std:c++17 --host_cxxopt=/std:c++17 --client_env=BAZEL_CXXOPTS=/std:c++17
+# Since we use designated initializers (C99 ... but >= c++20), compiler really wants the c++20 mode
+common:windows --compiler=clang-cl --cxxopt=/std:c++20 --host_cxxopt=/std:c++20 --client_env=BAZEL_CXXOPTS=/std:c++20
 
 # Address sanitizer settings.
 build:asan --strip=never
diff --git a/.github/workflows/verible-ci.yml b/.github/workflows/verible-ci.yml
index c70819865..11c146eb3 100644
--- a/.github/workflows/verible-ci.yml
+++ b/.github/workflows/verible-ci.yml
@@ -500,22 +500,26 @@ jobs:
         restore-keys: bazelcache_windows2_
 
     - name: Install dependencies
-      # Bazel breaks on Windows with LLVM 16. Will be fixed in bazel 6.4
-      run: choco install llvm --force --version=15.0.7
+      run: |
+        choco install bazel --force --version=6.4.0
+        choco install llvm --force
 
     - name: Debug bazel directory settings
-      run: bazel info
+      # We need to explicitly call the bazel binary from choco, otherwise
+      # the default Windows runner seems to run bazelisk(?) and downloads the
+      # latest bazel, which is incompatible. Should be in variable.
+      run: C:/ProgramData/chocolatey/lib/bazel/bazel.exe info
 
     - name: Run Tests
-      run: bazel test --keep_going --noshow_progress --test_output=errors //...
+      run: C:/ProgramData/chocolatey/lib/bazel/bazel.exe test --keep_going --noshow_progress --test_output=errors //...
 
     - name: Build Verible Binaries
-      run: bazel build --keep_going --noshow_progress -c opt :install-binaries
+      run: C:/ProgramData/chocolatey/lib/bazel/bazel.exe build --keep_going --noshow_progress -c opt :install-binaries
 
     - name: Prepare release
       run: |
         $VERSION = git describe --match=v*
-        bazel run -c opt :install -- "c:/verible-${VERSION}-win64"
+        C:/ProgramData/chocolatey/lib/bazel/bazel.exe run -c opt :install -- "c:/verible-${VERSION}-win64"
         7z a "verible-${VERSION}-win64.zip" "c:/verible-${VERSION}-win64"
 
     - name: 📤 Upload artifact
@@ -528,7 +532,7 @@ jobs:
     # prevents packaging up the cache.
     - name: Stop Bazel
       run: |
-        bazel shutdown
+        C:/ProgramData/chocolatey/lib/bazel/bazel.exe shutdown
         # The cache pack/restore has issues with these symbolic links
         rm c:/users/runneradmin/_bazel_runneradmin/*/install
         rm c:/users/runneradmin/_bazel_runneradmin/*/java.log