diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 34cffd96..e6b189db 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -39,8 +39,10 @@ jobs:
       run: yes | rm -rf ./arclight-coremod/build/libs
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew idea build --no-daemon -i
+    - name: Setup workspace
+      run: ./gradlew idea remapSpigotJar --no-daemon -i
+    - name: Build
+      run: ./gradlew build --no-daemon -i
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
diff --git a/appveyor.yml b/appveyor.yml
index 2c087e4f..f7d41778 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,8 @@ cache:
 build_script:
   - cmd: |
       IF EXIST arclight-coremod\build\libs ( del /S /Q arclight-coremod\build\libs )
-      gradlew idea build --no-daemon -i
+      gradlew idea remapSpigotJar --no-daemon -i
+      gradlew build --no-daemon -i
 test: off
 artifacts:
   - path: ./arclight-coremod/build/libs/*.*