diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b3db3cf8c..856321723 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -43,6 +43,15 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    # Java setup step completes very fast, no need to run in a preconfigured docker container.
+    # CodeQL is intended to detect any Java toolchains added to the execution environment.
+    - name: Set up JDK 20
+      uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 20
+        cache: gradle
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2