diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e4fd5bda..4470865e 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -26,17 +26,7 @@ jobs:
         uses: gradle/gradle-build-action@v2
 
       - name: Build Artifact
-        run: |
-          ./gradlew build
-          rm -rf build/libs/*-plain.jar
-          cp build/libs/*.jar "build/libs/aqua-nightly.jar"
-
-      - name: Generate Prerelease Release Notes
-        run: |
-          echo '### Nightly Release' >> ReleaseNotes.md
-          echo 'This nightly release is automatically built by github actions.' >> ReleaseNotes.md
-          echo '### The latest five updates are:' >> ReleaseNotes.md
-          git log -"5" --format="- %H %s" | sed '/^$/d' >> ReleaseNotes.md
+        run: bash ./tools/build.sh
 
       - name: Delete previous nightly release
         run: |
@@ -47,8 +37,8 @@ jobs:
       - name: Publish GitHub Release
         uses: ncipollo/release-action@v1
         with:
-          bodyFile: ReleaseNotes.md
-          artifacts: "build/libs/aqua-nightly.jar"
+          bodyFile: "build/release/ReleaseNotes.md"
+          artifacts: "build/libs/aqua-nightly.jar,build/aqua-nightly.zip"
           tag: "nightly"
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: false
diff --git a/tools/build.sh b/tools/build.sh
new file mode 100644
index 00000000..a0c801f6
--- /dev/null
+++ b/tools/build.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+# Stop on error
+set -e
+set -x
+
+# Build jar
+#./gradlew build --parallel -x test
+rm -rf build/libs/aqua-nightly.jar
+rm -rf build/libs/*-plain.jar
+cp build/libs/*.jar "build/libs/aqua-nightly.jar"
+
+echo "Creating release package"
+PACK="build/release"
+rm -rf "$PACK"
+mkdir -p "$PACK"
+cp build/libs/aqua-nightly.jar "$PACK/aqua.jar"
+cp -r config "$PACK/config"
+mkdir -p "$PACK/data"
+
+NOTES="$PACK/ReleaseNotes.md"
+echo '### AquaDX Nightly Release' >> "$NOTES"
+echo "This nightly release is automatically built by github actions on $(date)." >> "$NOTES"
+echo "https://github.com/hykilpikonna/AquaDX" >> "$NOTES"
+echo '### The latest five updates are:' >> "$NOTES"
+git log -"5" --format="- %H %s" | sed '/^$/d' >> "$NOTES"
+
+echo "Compressing"
+cd build/release
+zip -r ../aqua-nightly.zip .
\ No newline at end of file