diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 5e45454..2686854 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -3,35 +3,28 @@
 
 name: mvn verify
 
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        java: [17]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        java: [17, 21, 22, 23-ea]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK
+    - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
-        distribution: zulu
-    - name: Cache local maven repository
-      uses: actions/cache@v4
-      with:
-        path: ~/.m2
-        key: ${{ matrix.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ matrix.os }}-m2
+        distribution: temurin
+        cache: 'maven'
+    - name: Download Maven Wrapper
+      run: mvn wrapper:wrapper "-Dmaven=3.9.8"
     - name: Build with Maven
-      run: mvn -B -V -e "-Dstyle.color=always" verify -DskipFormat -DverifyFormat
+      run: ./mvnw -B -V -e "-Dstyle.color=always" verify "-Drevelc.skipFormat" "-Drevelc.verifyFormat"
       env:
         MAVEN_OPTS: -Djansi.force=true
 
diff --git a/pom.xml b/pom.xml
index 1091c76..0673c94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
     <url>https://github.com/revelc/${github.site.repositoryName}</url>
   </scm>
   <properties>
-    <formatter.configFile>contrib/eclipse-java-style.xml</formatter.configFile>
+    <formatter.configFile>src/build/eclipse-java-style.xml</formatter.configFile>
     <invoker.streamLogs>true</invoker.streamLogs>
     <maven.compiler.release>8</maven.compiler.release>
   </properties>
diff --git a/contrib/eclipse-java-style.xml b/src/build/eclipse-java-style.xml
similarity index 100%
rename from contrib/eclipse-java-style.xml
rename to src/build/eclipse-java-style.xml