diff --git a/.dockerignore b/.dockerignore
index 9765ae8..e8d4627 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,10 @@
 .idea
 data
+tmp
 temp
 node_modules
 app/node_modules
 npm-debug.log
 scripts
 docs
+_releases
diff --git a/.gitignore b/.gitignore
index 175190a..8cc17e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ data
 temp
 node_modules
 npm-debug.log
+_releases
diff --git a/scripts/create-bundle.sh b/scripts/create-bundle.sh
new file mode 100755
index 0000000..53a935e
--- /dev/null
+++ b/scripts/create-bundle.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+
+# Get the current tag or use commit hash if there's none
+NAME=$(git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null || git log -n1 --pretty='%h')
+
+echo "Building app"
+cd $DIR/../app
+npm install
+npm run build
+
+
+echo "Bundling to _releases/psitransfer-$NAME.tar.gz"
+cd $DIR/..
+mkdir -p _releases
+
+tar -czf _releases/psitransfer-$NAME.tar.gz --transform "s~^~psitransfer-$NAME/~" \
+  LICENSE \
+  README.md \
+  Dockerfile \
+  .dockerignore \
+  app.js \
+  config.js \
+  package.json \
+  docs \
+  lib \
+  public
+
+echo "DONE"
diff --git a/tmp/scripts/release.sh b/tmp/scripts/release.sh
deleted file mode 100644
index 5f02d80..0000000
--- a/tmp/scripts/release.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-# tar -czf psitransfer-1.0.0-rc.1.tar.gz --transform 's~^~psitransfer-1.0.0-rc.1/~' LICENSE README.md app.js config.* data lib package.json public