diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 84fb6a3bc..23db3153c 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -12,13 +12,21 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: ["ubuntu-20.04", "ubuntu-22.04"]
+        os: ["ubuntu-20.04"]
         python-version: ["3.8", "3.9", "3.10", "3.11"]
+        java-version: ["8"]
         include:
           - os: "ubuntu-20.04"
             clang-version-suffix: "-11"
+          - os: "ubuntu-20.04"
+            python-version: "3.8"
+            java-version: "11"
+            clang-version-suffix: "-11"
           - os: "ubuntu-22.04"
+            python-version: "3.8"
+            java-version: "8"
             clang-version-suffix: "-14"
+    name: OS ${{matrix.os}}, Python ${{matrix.python-version}}, Java ${{matrix.java-version}}
     env:
       CPPCHECK_HOME: "${{github.workspace}}/cppcheck-2.6"
       SPOTBUGS_HOME: "${{github.workspace}}/spotbugs-4.8.2"
@@ -34,11 +42,11 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Set up JDK 1.8
+    - name: Set up Java ${{matrix.java-version}}
       uses: actions/setup-java@v3
       with:
         distribution: temurin
-        java-version: 8
+        java-version: ${{matrix.java-version}}
 
     - name: Set up Python ${{matrix.python-version}}
       uses: actions/setup-python@v4
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 1c1810fa6..e8b36edac 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -12,8 +12,14 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: ["windows-latest"]
+        os: ["windows-2022"]
         python-version: ["3.8", "3.9", "3.10", "3.11"]
+        java-version: ["8"]
+        include:
+          - os: "windows-2022"
+            python-version: "3.8"
+            java-version: "11"
+    name: OS ${{matrix.os}}, Python ${{matrix.python-version}}, Java ${{matrix.java-version}}
     env:
       CPPCHECK_HOME: "/c/Program Files/Cppcheck"
       SPOTBUGS_HOME: "${{github.workspace}}/spotbugs-4.8.2"
@@ -29,11 +35,11 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Set up JDK 1.8
+    - name: Set up Java ${{matrix.java-version}}
       uses: actions/setup-java@v3
       with:
         distribution: temurin
-        java-version: 8
+        java-version: ${{matrix.java-version}}
 
     - name: Convert environment variables to POSIX paths
       run: |