diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml
index 664863a8ace..0a89236ee0b 100644
--- a/.github/workflows/codeql-daily.yml
+++ b/.github/workflows/codeql-daily.yml
@@ -7,7 +7,14 @@ on:
 
 jobs:
   analyze:
-    runs-on: ubuntu-latest
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      security-events: write  # for github/codeql-action/analyze to upload SARIF results
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ java, cpp ]
 
     steps:
       - uses: actions/checkout@v4
@@ -21,12 +28,12 @@ jobs:
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
-          languages: java
+          languages: ${{ matrix.language }}
 
       - uses: gradle/gradle-build-action@v3
         with:
           # skipping build cache is needed so that all modules will be analyzed
-          arguments: assemble --no-build-cache
+          arguments: assemble -Dai.etw.native.build=release --no-build-cache
 
       - name: Perform CodeQL analysis
         uses: github/codeql-action/analyze@v3