diff --git a/deploy.sh b/deploy.sh
index 45adb7f..f785ceb 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -27,7 +27,12 @@ if [ -d "${DEPLOY_DIR}" ]; then
     sudo rm -rf "${DEPLOY_DIR}"
 fi
 sudo mkdir -p "$(dirname "${DEPLOY_DIR}")"
-sudo unzip jrunner/build/distributions/jrunner.zip -d "$(dirname "${DEPLOY_DIR}")"
+sudo unzip -q jrunner/build/distributions/jrunner.zip -d "$(dirname "${DEPLOY_DIR}")"
+
+# Rename if custom directory name was specified
+if [ "$(basename "${DEPLOY_DIR}")" != "jrunner" ]; then
+    sudo mv "$(dirname "${DEPLOY_DIR}")/jrunner" "${DEPLOY_DIR}"
+fi
 
 # Only create symlink for default location
 if [ "${DEPLOY_DIR}" = "/opt/jrunner" ]; then