diff --git a/.github/workflows/dco-check.yml b/.github/workflows/dco-check.yml
deleted file mode 100644
index 9a4e700066..0000000000
--- a/.github/workflows/dco-check.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
-#
-# SPDX-License-Identifier: MPL-2.0
-
-name: Check DCO
-# Workaround because DCO plugin is stuck. See https://github.com/dcoapp/app/issues/211
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-
-jobs:
-  dco:
-    name: DCO
-    runs-on: ubuntu-latest
-    if: ${{ github.actor != 'dependabot[bot]' }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-          architecture: x64
-
-      - name: Check DCO
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          pip install dco-check
-          dco-check --verbose
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 76e01c5606..d402fdbe66 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -99,7 +99,7 @@ jobs:
     strategy:
       matrix:
         build-option: [ debug, release ]
-        compiler: [msvc]  # , clang-cl] TODO(mgovers): reenable Clang CL when https://github.com/actions/runner-images/issues/10001 is fixed
+        compiler: [msvc, clang-cl]
 
     env:
       PRESET: ${{ matrix.compiler }}-${{ matrix.build-option }}
@@ -127,6 +127,10 @@ jobs:
           Import-Module (Join-Path $vsPath 'Common7\Tools\Microsoft.VisualStudio.DevShell.dll')
           Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation -DevCmdArguments '-arch=x64 -host_arch=x64'
 
+          # Resolve dirty PATH environment
+          # TODO(mgovers): Remove after https://github.com/actions/runner-images/issues/10001 is resolved
+          $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' }) -join ';'
+
           # generate cmake cache
           cmake --preset ${{ env.PRESET }} -DCMAKE_PREFIX_PATH=C:\conda_envs\cpp_pkgs\Library; if(!$?) { Exit $LASTEXITCODE }
           # build