diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f775089..45a5c50 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,24 +1,46 @@
-name: Java CI
+name: Build (Maven)
 
 on:
   push:
     branches:
-    - master
+      - master
+      - main
   pull_request:
     branches:
-    - master
+      - master
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: read
+
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 16
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'zulu'
-        java-version: 16
-    - name: Build with Maven
-      run: mvn package --file pom.xml
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+          cache: maven
+
+      - name: Verify Maven wrapper (if present)
+        run: |
+          if [ -f ./mvnw ]; then
+            chmod +x mvnw
+          fi
+
+      - name: Build with Maven
+        run: mvn -B clean package
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: FoxyMachines-build
+          path: target/*.jar
+          if-no-files-found: error