diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 75cab9e8..43e485d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,12 +7,8 @@ on:
       - 'Jenkinsfile'
     branches:
       - ver/1.16.5
-      - ver/1.16.4
-      - ver/1.16.3
-      - ver/1.16.2
-      - ver/1.16.1
-      - leaflight/ver/1.16.4
-      - leaflight/ver/1.16.5
+      - dev/*
+      - staging/1.16.5
   pull_request:
     paths-ignore:
       - '*.md'
@@ -77,7 +73,6 @@ jobs:
         ./gradlew clean build paperclip
         
     - name: Upload Artifact
-      if: github.ref != 'refs/heads/ver/1.16.4'
       uses: actions/upload-artifact@v2
       with:
         name: Yatopia-${{ matrix.java }}
diff --git a/Jenkinsfile b/Jenkinsfile
index cd91b073..0823a8d4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,12 +51,20 @@ pipeline {
                 ) {
                     withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) {
                         sh '''
-                        ./gradlew clean build paperclip publish
+                        ./gradlew clean build publish
                         mkdir -p "./target"
                         basedir=$(pwd)
                         paperworkdir="$basedir/Paper/work"
                         mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
-                        cp "yatopia-$mcver-paperclip.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar"
+                        
+                        patchedJarPath="$basedir/Yatopia-Server/build/libs/yatopia-server-$mcver-R0.1-SNAPSHOT.jar"
+                        vanillaJarPath="$paperworkdir/Minecraft/$mcver/$mcver.jar"
+
+                        cd "$paperworkdir/Paperclip"
+                        mvn -T 2C clean package -Dmcver="$mcver" -Dpaperjar="$patchedJarPath" -Dvanillajar="$vanillaJarPath" -Dstyle.color=never
+                        cd "$basedir"
+
+                        cp -v "$paperworkdir/Paperclip/assembly/target/paperclip-$mcver.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar"
                         '''
                     }
                 }