diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 7ef52520..28cf365f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -9,18 +9,23 @@ on:
   workflow_dispatch:
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 3
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        java_version: [17, 21]
+    runs-on: ${{ matrix.os }}
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.java_version }}
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v3
       with:
         distribution: 'adopt'
-        java-version: 17
+        java-version: ${{ matrix.java_version }}
         cache: 'maven'
     - name: Build with Maven
       # Maven deploy on changes (or manual run) to master, otherwise just package it
-      run: mvn -s "${GITHUB_WORKSPACE}/.github/workflows/maven-settings.xml" -B ${{ (((github.event_name == 'push') || (github.event_name == 'workflow_dispatch')) && (github.ref == 'refs/heads/master')) && 'deploy' || 'package' }} --file pom.xml -Prelease,release-snapshot
+      run: mvn -s "${GITHUB_WORKSPACE}/.github/workflows/maven-settings.xml" -B ${{ (((github.event_name == 'push') || (github.event_name == 'workflow_dispatch')) && (github.ref == 'refs/heads/master') && (matrix.os == 'ubuntu-latest') && (matrix.java_version == '17')) && 'deploy' || 'package' }} --file pom.xml -Prelease,release-snapshot
       env:
         GITHUB_TOKEN: ${{ github.token }}