diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 76312b100d..7e85e315ae 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -60,23 +60,14 @@ jobs:
         if: ${{ matrix.language == 'actions' }}
         with:
           languages: actions
-      - name: Initialize CodeQL (Java - Fast)
+      - name: Initialize CodeQL (Java)
         uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-        if: ${{ matrix.language == 'java' && github.event_name != 'schedule' }}
-        with:
-          queries: +security-and-quality,security-extended,security-experimental
-          languages: java-kotlin
-          packs: >
-            +codeql/java-queries:.
-      - name: Initialize CodeQL (Java - Thorough)
-        uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
-        if: ${{ matrix.language == 'java' && github.event_name == 'schedule' }}
+        if: ${{ matrix.language == 'java' }}
         with:
-          queries: +security-and-quality,security-extended,security-experimental
+          queries: +java-code-scanning,security-and-quality,security-extended,security-experimental
           languages: java-kotlin
           packs: >
-            +codeql/java-queries:.,
-            githubsecuritylab/codeql-java-queries,
+            +githubsecuritylab/codeql-java-queries,
             githubsecuritylab/codeql-java-extensions,
             githubsecuritylab/codeql-java-library-sources,
             githubsecuritylab/codeql-java-queries:suites/java-local.qls