diff --git a/Dockerfile b/Dockerfile
index e8ef3c1..83818d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,13 +4,13 @@ VOLUME /etc/mxisd
 VOLUME /var/mxisd
 EXPOSE 8090
 
+RUN apk update && apk add bash && rm -rf /var/lib/apk/* /var/cache/apk/*
 ADD build/libs/mxisd.jar /mxisd.jar
 ADD src/docker/start.sh /start.sh
-RUN mkdir -p /var/mxisd
 
 ENV JAVA_OPTS=""
 ENV CONF_FILE_PATH="/etc/mxisd/mxisd.yaml"
 ENV SIGN_KEY_PATH="/var/mxisd/sign.key"
 ENV SQLITE_DATABASE_PATH="/var/mxisd/mxisd.db"
 
-CMD [ "/start.sh" ]
\ No newline at end of file
+CMD [ "/start.sh" ]
diff --git a/src/docker/start.sh b/src/docker/start.sh
index 91605b6..11040f0 100755
--- a/src/docker/start.sh
+++ b/src/docker/start.sh
@@ -1,20 +1,19 @@
-#!/bin/sh
-
-if ! [ -z "$CONF_FILE_PATH" ] && ! [ -f "CONF_FILE_PATH" ]; then
+#!/usr/bin/env bash
+if [[ -n "$CONF_FILE_PATH" ]] && [ ! -f "$CONF_FILE_PATH" ]; then
     echo "Generating config file $CONF_FILE_PATH"
     touch "CONF_FILE_PATH"
 
-    if ! [ -z "$MATRIX_DOMAIN" ]; then
+    if [[ -n "$MATRIX_DOMAIN" ]]; then
         echo "Setting matrix domain to $MATRIX_DOMAIN"
         echo "matrix.domain: $MATRIX_DOMAIN" >> "$CONF_FILE_PATH"
     fi
 
-    if ! [ -z "$SIGN_KEY_PATH" ]; then
+    if [[ -n "$SIGN_KEY_PATH" ]]; then
         echo "Setting signing key path to $SIGN_KEY_PATH"
         echo "key.path: $SIGN_KEY_PATH" >> "$CONF_FILE_PATH"
     fi
 
-    if ! [ -z "$SQLITE_DATABASE_PATH" ]; then
+    if [[ -n "$SQLITE_DATABASE_PATH" ]]; then
         echo "Setting SQLite DB path to $SQLITE_DATABASE_PATH"
         echo "storage.provider.sqlite.database: $SQLITE_DATABASE_PATH" >> "$CONF_FILE_PATH"
     fi
@@ -23,4 +22,4 @@ if ! [ -z "$CONF_FILE_PATH" ] && ! [ -f "CONF_FILE_PATH" ]; then
     echo
 fi
 
-exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -Dspring.config.location=/etc/mxisd/ -Dspring.config.name=mxisd -jar /mxisd.jar
\ No newline at end of file
+exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -Dspring.config.location=/etc/mxisd/ -Dspring.config.name=mxisd -jar /mxisd.jar