diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 4c8d80e..2bc4158 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -17,7 +17,11 @@ jobs:
       fail-fast: true
       matrix:
         os: [windows-2019]
-        compiler: [cl, clang-cl]
+        compiler:
+          - cmd: cl
+            cppad_codegen: OFF
+          - cmd: clang-cl
+            cppad_codegen: ON
 
     steps:
     - uses: actions/checkout@v4
@@ -33,17 +37,16 @@ jobs:
         auto-activate-base: false
 
     - name: Setup cppad codegen
-      if: contains(matrix.compiler, 'clang')
+      if: contains(matrix.compiler.cmd, 'clang')
       shell: cmd /C CALL {0}
       run: |
         conda install cppadcodegen
-        echo "BUILD_CPPAD_CODEGEN=ON" >> "$GITHUB_ENV"
 
     - name: Build PyCppAD
       shell: cmd /C CALL {0}
       env:
-        CC: ${{ matrix.compiler }}
-        CXX: ${{ matrix.compiler }}
+        CC: ${{ matrix.compiler.cmd }}
+        CXX: ${{ matrix.compiler.cmd }}
       run: |
         :: Create build directory
         mkdir build
@@ -56,7 +59,7 @@ jobs:
           -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^
           -DPYTHON_SITELIB=%CONDA_PREFIX%\Lib\site-packages ^
           -DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^
-          -DBUILD_WITH_CPPAD_CODEGEN_BINDINGS=%BUILD_CPPAD_CODEGEN% ^
+          -DBUILD_WITH_CPPAD_CODEGEN_BINDINGS=${{ matrix.compiler.cppad_codegen }} ^
           ..
 
         :: Build