diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28ce82d2..90824513 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,6 +96,9 @@ jobs:
       run: |
         git reset --hard
         git pull
+        # Workaround for breaking changes ("Migrate tool metadata from XML to JSON format")
+        git checkout 358f3893843c9d0d1b2e594183481fb68e3aa963~1
+        git status
 
     # Setup a CentOS 7 container to build on Linux x64 for backwards compatibility.
     - name: Start CentOS container and install toolchain
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f72e33ee..1d3b245f 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -28,6 +28,9 @@ jobs:
         cd $VCPKG_INSTALLATION_ROOT
         git reset --hard
         git pull
+        # Workaround for breaking changes ("Migrate tool metadata from XML to JSON format")
+        git checkout 358f3893843c9d0d1b2e594183481fb68e3aa963~1
+        git status
 
     - name: Setup .NET SDK v8.0.x
       uses: actions/setup-dotnet@v4