diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index 29d7f7d..afd8b51 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -1,19 +1,33 @@
-name: Dev Build
-on:
-  push:
-    branches: [ '*' ]
+name: build
+on: [pull_request, push]
+
 jobs:
   build:
-    name: Build
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # Use these Java versions
+        java: [21]
+        # and run on both Linux and Windows
+        os: [ubuntu-20.04, windows-latest]
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v1
+      - name: checkout repository
+        uses: actions/checkout@v4
+      - name: validate gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v4
         with:
-          java-version: 21
-      - run: ./gradlew build --stacktrace --no-daemon
-      - uses: actions/upload-artifact@v2
+          distribution: temurin
+          java-version: ${{ matrix.java }}
+      - name: make gradle wrapper executable
+        if: ${{ runner.os != 'Windows' }}
+        run: chmod +x ./gradlew
+      - name: build
+        run: ./gradlew build
+      - name: capture build artifacts
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
+        uses: actions/upload-artifact@v4
         with:
-          name: Artifacts from ${{ github.sha }}
-          path: versions/*/build/libs/
+          name: Artifacts
+          path: build/libs/