diff --git a/.forgejo/workflows/generale.tarball.yml b/.forgejo/workflows/generale-tarball.yml
similarity index 76%
rename from .forgejo/workflows/generale.tarball.yml
rename to .forgejo/workflows/generale-tarball.yml
index eb83c19c2..36fedd938 100644
--- a/.forgejo/workflows/generale.tarball.yml
+++ b/.forgejo/workflows/generale-tarball.yml
@@ -11,17 +11,18 @@ jobs:
     name: Build tarball w/ submodules
     runs-on: x86_64
     container:
-      image: alpine:latest
+      image: alpine:3.19
     env:
       CI_PROJECT_NAME: papermc
     steps:
       - name: Environment setup
-        run: apk add nodejs git git-archive-all gzip
+        run: apk add nodejs git openjdk21-jre-headless gzip
       - name: Repo pull
         uses: actions/checkout@v4
         with:
           fetch-depth: 500
           ref: ${{ inputs.ref_name }}
+          path: $CI_PROJECT_NAME
       - name: Package build
         run: |
           if test $GITHUB_REF_NAME == "ci" ; then
@@ -30,7 +31,14 @@ jobs:
             CI_REF_NAME=$GITHUB_REF_NAME
           fi
           echo "building tarball for $CI_REF_NAME"
-          git-archive-all --force-submodules $CI_PROJECT_NAME-$CI_REF_NAME.tar.gz
+          cd $CI_PROJECT_NAME
+          ./gradlew --parallel applyPatches
+          cd ../
+          mv $CI_PROJECT_NAME $CI_PROJECT_NAME-$CI_REF_NAME
+          msg "generating tarball.."
+          tar -cf $CI_PROJECT_NAME-$CI_REF_NAME.tar --exclude-backups --exclude-caches-all --exclude-vcs $CI_PROJECT_NAME-$CI_REF_NAME
+          echo "Compressing $CI_PROJECT_NAME-$CI_REF_NAME.tar.xz"
+          xz -T0 -9 -vv -e -c > ./$CI_PROJECT_NAME-$CI_REF_NAME.tar.xz < ./$CI_PROJECT_NAME-$CI_REF_NAME.tar
           echo "Generating sha512sum"
           sha512sum $CI_PROJECT_NAME-$CI_REF_NAME.tar.gz > $CI_PROJECT_NAME-$CI_REF_NAME.tar.gz.sha512sum
       - name: Package upload