diff --git a/.github/workflows/java-gradle-checkstyle.yml b/.github/workflows/java-gradle-checkstyle.yml
new file mode 100644
index 0000000..0c679fb
--- /dev/null
+++ b/.github/workflows/java-gradle-checkstyle.yml
@@ -0,0 +1,59 @@
+# yamllint disable rule:line-length
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+# yamllint enable rule:line-length
+---
+
+name: Java CI Tests with Gradle
+
+on: # yamllint disable-line rule:truthy
+  push:
+    branches: ["main"]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ["main"]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    name: Java Gradle CI LINT Checkstyle
+
+    strategy:
+      matrix:
+        os: ["windows-2022", "ubuntu-24.04", "macos-14"]
+        java: ['22', '23', '24']
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: temurin
+
+      - name: Tool test
+        run: |
+          echo "Java version: ${{ matrix.java }}"
+          java -version
+          echo "OS: ${{ matrix.os }}"
+          echo "Gradle version:"
+          ./gradlew --version
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Clean
+        run: ./gradlew --console=verbose clean
+
+      - name: Lint
+        run: ./gradlew --console=verbose checkstyleMain checkstyleTest
diff --git a/.github/workflows/java-gradle-coverage.yml b/.github/workflows/java-gradle-coverage.yml
index d91d903..126f091 100644
--- a/.github/workflows/java-gradle-coverage.yml
+++ b/.github/workflows/java-gradle-coverage.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 22
+          java-version: 24
           # Alternative distribution options are available
           distribution: temurin
       - name: Validate Gradle wrapper
diff --git a/.github/workflows/java-gradle.yml b/.github/workflows/java-gradle.yml
index 26f83de..e40a53a 100644
--- a/.github/workflows/java-gradle.yml
+++ b/.github/workflows/java-gradle.yml
@@ -22,8 +22,8 @@ permissions:
   contents: read
 
 jobs:
-  gradle:
-    name: Java Gradle CI Test
+  test:
+    name: Java Gradle CI Test JUNit Jupiter
 
     strategy:
       matrix:
@@ -55,8 +55,5 @@ jobs:
       - name: Clean
         run: ./gradlew --console=verbose clean
 
-      - name: Lint
-        run: ./gradlew --console=verbose checkstyleMain checkstyleTest
-
       - name: Run tests
         run: ./gradlew --console=verbose test -x checkstyleMain checkstyleTest