diff --git a/.github/workflows/leaves.yml b/.github/workflows/build.yml
similarity index 84%
rename from .github/workflows/leaves.yml
rename to .github/workflows/build.yml
index b1621b75..537b67a7 100644
--- a/.github/workflows/leaves.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     steps:
       - name: Get repository
         uses: actions/checkout@v4
@@ -28,7 +27,7 @@ jobs:
       - name: Setup Git Config
         run: |
           git config --global user.email "ci@leavesmc.org"
-          git config --global user.name "Leaves CI"
+          git config --global user.name "LeavesMC CI"
       - name: Get Build Number
         run: bash scripts/GetBuildNumber.sh
       - name: Apply Patches
@@ -37,7 +36,7 @@ jobs:
         run: ./gradlew createMojmapLeavesclipJar
         env:
           BUILD_NUMBER: ${{ env.BUILD_NUMBER }}
-      - name: Publish API
+      - name: Publish to Maven repo
         continue-on-error: true
         run: ./gradlew publish
         env:
@@ -65,8 +64,20 @@ jobs:
         run: sh scripts/GetReleaseInfo.sh
         env:
           BUILD_NUMBER: ${{ env.BUILD_NUMBER }}
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.jar }}
+          path: ${{ env.jar }}
+      - name: Delete Draft Releases
+        if: "!contains(github.event.commits[0].message, '[release-skip]')"
+        continue-on-error: true
+        uses: hugo19941994/delete-draft-releases@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Create Release
         if: "!contains(github.event.commits[0].message, '[release-skip]')"
+        continue-on-error: true
         uses: ncipollo/release-action@v1
         with:
           artifacts: ${{ env.jar }}
@@ -76,24 +87,24 @@ jobs:
           prerelease: ${{ env.pre }}
           token: ${{ secrets.GITHUB_TOKEN }}
           makeLatest: ${{ env.make_latest }}
-      - name: Delete Draft Releases
-        uses: hugo19941994/delete-draft-releases@v1.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Github Releases To Discord
+        if: "!contains(github.event.commits[0].message, '[release-skip]')"
         continue-on-error: true
         uses: tsickert/discord-webhook@v6.0.0
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK }}
           raw-data: ${{ env.discordmes }}
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.jar }}
-          path: ${{ env.jar }}
-      - name: Push to Api
+      - name: Upload to cloud
+        if: "!contains(github.event.commits[0].message, '[release-skip]')"
         continue-on-error: true
+        uses: wei/rclone@v1
+        env:
+          RCLONE_CONF: ${{ secrets.RCLONE_CONF }}
+        with:
+          args: copy ${{ env.jar }} FTP:${{ env.tag }}
+      - name: Push to API
         if: "!contains(github.event.commits[0].message, '[release-skip]')"
+        continue-on-error: true
         env:
           secret: ${{ secrets.API_PUSH_TOKEN }}
           secret_v2: ${{ secrets.API_V2_PUSH_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 726b5c89..06224b3c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,21 +1,11 @@
-# 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://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
 name: Leaves Test CI
 
 on:
   push:
-    branches-ignore:
-      - master
+    branches-ignore: [ master ]
   pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
+  workflow_dispatch:
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -38,14 +28,20 @@ jobs:
       - name: Setup Git Config
         run: |
           git config --global user.email "ci@leavesmc.org"
-          git config --global user.name "Leaves CI"
+          git config --global user.name "LeavesMC CI"
+      - name: Get Build Number
+        run: bash scripts/GetBuildNumber.sh
       - name: Apply Patches
         run: ./gradlew applyPatches
-      - name: Create Paperclip Jar
-        run: ./gradlew createReobfPaperclipJar
+      - name: Create Leavesclip Jar
+        run: ./gradlew createMojmapLeavesclipJar
+        env:
+          BUILD_NUMBER: ${{ env.BUILD_NUMBER }}
       - name: Get Release Info
         run: sh scripts/GetReleaseInfo.sh
-      - name: Archive Leaves
+        env:
+          BUILD_NUMBER: ${{ env.BUILD_NUMBER }}
+      - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.jar }}