diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
new file mode 100644
index 0000000..848cc0f
--- /dev/null
+++ b/.github/workflows/gradle.yml
@@ -0,0 +1,39 @@
+name: Java CI
+
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+
+jobs:
+  # Build Movecraft-CoreProtect
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout Movecraft-CoreProtect
+        uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+          build-scan-terms-of-use-agree: "yes"
+
+      - name: Build with Gradle
+        run: ./gradlew clean build --parallel
+
+      - name: Stage jar
+        run: mkdir staging && cp build/libs/Movecraft-CoreProtect.jar staging && mv staging/Movecraft-CoreProtect.jar staging/Movecraft-CoreProtect_$GITHUB_SHA.jar
+      - name: Upload jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: Movecraft-CoreProtect_Dev-Build
+          path: staging/Movecraft-CoreProtect_*.jar
\ No newline at end of file
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
deleted file mode 100644
index 3aeb4e5..0000000
--- a/.github/workflows/maven.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Java CI
-
-on: [workflow_dispatch, push, pull_request]
-
-jobs:
-  # Build Movecraft-CoreProtect
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Movecraft-CoreProtect
-        uses: actions/checkout@v2
-        with:
-          path: Movecraft-CoreProtect
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: Cache Maven packages
-        id: cacheMain
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2
-          restore-keys: ${{ runner.os }}-m2
-      
-      # Build Movecraft-CoreProtect
-      - name: Build Movecraft-CoreProtect
-        run: mvn -B package -T 1C --file Movecraft-CoreProtect/pom.xml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Stage jar
-        run: mkdir staging && cp Movecraft-CoreProtect/target/Movecraft-CoreProtect*.jar staging
-      - name: Rename jar
-        run: mv staging/Movecraft-CoreProtect*.jar staging/Movecraft-CoreProtect_$GITHUB_SHA.jar
-      - name: Upload jar
-        uses: actions/upload-artifact@v2
-        with:
-          name: Movecraft-CoreProtect_Dev-Build
-          path: staging/Movecraft-CoreProtect_*.jar
\ No newline at end of file