diff --git a/.gitignore b/.gitignore
index 617660ff..7fb91f6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,6 @@ server/tmp/
 server/tachiserver-data/
 
 # bundle asset downlaods
-OpenJDK*.zip
-electron-*.zip
+OpenJDK*.*
+electron-*.*
 rcedit-*
diff --git a/scripts/resources/tachidesk-browser-launcher-linux.sh b/scripts/resources/tachidesk-browser-launcher-linux.sh
new file mode 100755
index 00000000..dd6bf7a7
--- /dev/null
+++ b/scripts/resources/tachidesk-browser-launcher-linux.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./jre/bin/java -jar Tachidesk.jar
\ No newline at end of file
diff --git a/scripts/resources/tachidesk-browser-launcher-macOS.sh b/scripts/resources/tachidesk-browser-launcher-macOS.sh
new file mode 100755
index 00000000..edc041fd
--- /dev/null
+++ b/scripts/resources/tachidesk-browser-launcher-macOS.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./jre/Contents/Home/bin/java -jar Tachidesk.jar
\ No newline at end of file
diff --git a/scripts/resources/tachidesk-debug-launcher-linux.sh b/scripts/resources/tachidesk-debug-launcher-linux.sh
new file mode 100755
index 00000000..9d16982f
--- /dev/null
+++ b/scripts/resources/tachidesk-debug-launcher-linux.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./jre/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk.jar
diff --git a/scripts/resources/tachidesk-debug-launcher-macOS.sh b/scripts/resources/tachidesk-debug-launcher-macOS.sh
new file mode 100755
index 00000000..ae8f5184
--- /dev/null
+++ b/scripts/resources/tachidesk-debug-launcher-macOS.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./jre/Contents/Home/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk.jar
diff --git a/scripts/resources/tachidesk-electron-launcher-linux.sh b/scripts/resources/tachidesk-electron-launcher-linux.sh
new file mode 100755
index 00000000..d1eaabc1
--- /dev/null
+++ b/scripts/resources/tachidesk-electron-launcher-linux.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./jre/bin/java "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron" -jar Tachidesk.jar
\ No newline at end of file
diff --git a/scripts/resources/tachidesk-electron-launcher-macOS.sh b/scripts/resources/tachidesk-electron-launcher-macOS.sh
new file mode 100755
index 00000000..79cf9e2c
--- /dev/null
+++ b/scripts/resources/tachidesk-electron-launcher-macOS.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./jre/Contents/Home/bin/java "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/Electron.app/Contents/MacOS/Electron" -jar Tachidesk.jar
\ No newline at end of file
diff --git a/scripts/unix-bundler.sh b/scripts/unix-bundler.sh
new file mode 100755
index 00000000..64892a94
--- /dev/null
+++ b/scripts/unix-bundler.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Copyright (C) Contributors to the Suwayomi project
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+electron_version="v12.0.9"
+
+if [ $1 = "linux-x64" ]; then
+  jre="OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz"
+  jre_release="jdk8u302-b08"
+  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
+  electron="electron-$electron_version-linux-x64.zip"
+elif [ $1 = "macOS-x64" ]; then
+  jre="OpenJDK8U-jre_x64_mac_hotspot_8u302b08.tar.gz"
+  jre_release="jdk8u302-b08"
+  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
+  electron="electron-$electron_version-darwin-x64.zip"
+else
+  echo "Unsupported arch value: $1"
+  exit 1
+fi
+
+arch="$1"
+os=$(echo $arch | cut -d '-' -f1)
+jre_dir="$jre_release-jre"
+
+echo "creating $arch bundle"
+
+jar=$(ls ../server/build/*.jar | tail -n1)
+jar_name=$(echo $jar | cut -d'/' -f4)
+release_name=$(echo $jar_name | sed 's/.jar//')-$arch
+
+
+# make release dir
+mkdir $release_name
+
+
+echo "Dealing with jre..."
+if [ ! -f $jre ]; then
+  curl -L $jre_url -o $jre
+fi
+tar xvf $jre
+mv $jre_dir $release_name/jre
+
+echo "Dealing with electron"
+if [ ! -f $electron ]; then
+  curl -L "https://github.com/electron/electron/releases/download/$electron_version/$electron" -o $electron
+fi
+unzip $electron -d $release_name/electron
+
+# copy artifacts
+cp $jar $release_name/Tachidesk.jar
+cp "resources/tachidesk-browser-launcher-$os.sh" "$release_name/tachidesk-browser-launcher.sh"
+cp "resources/tachidesk-debug-launcher-$os.sh" "$release_name/tachidesk-debug-launcher.sh"
+cp "resources/tachidesk-electron-launcher-$os.sh" "$release_name/tachidesk-electron-launcher.sh"
+
+archive_name=""
+if [ $os = linux ]; then
+  archive_name=$release_name.tar.gz
+  GZIP=-9 tar cvzf $archive_name $release_name
+elif [ $os = macOS ]; then
+  archive_name=$release_name.zip
+  zip -9 -r $archive_name $release_name
+fi
+
+rm -rf $release_name
+
+# clean up from possible previous runs
+if [ -f ../server/build/$archive_name ]; then
+  rm ../server/build/$archive_name
+fi
+
+mv $archive_name ../server/build/