diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1911079..814bad8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,8 +5,11 @@
 ENV GITBUCKET_PORT 8080
 ENV GITBUCKET_HOME /srv/gitbucket
 
+# mark voulmes
+VOLUME $GITBUCKET_HOME/repositories
+
 # set environment
-RUN mkdir $GITBUCKET_HOME
+#RUN mkdir $GITBUCKET_HOME
 WORKDIR $GITBUCKET_HOME
 
 # setup
@@ -25,4 +28,4 @@
 RUN chmod +x /docker-entrypoint.sh
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD java -jar $GITBUCKET_HOME/latest.war --host=$GITBUCKET_HOST --port=$GITBUCKET_PORT --gitbucket.home=$GITBUCKET_HOME 
+CMD java -jar $GITBUCKET_HOME/latest.war --host=$GITBUCKET_HOST --port=$GITBUCKET_PORT --gitbucket.home=$GITBUCKET_HOME
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 5b4421f..6b8305c 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
+set -e
 
 # replace mysql settings in config file
 dbfile=${GITBUCKET_HOME}/database.conf
-sed -i "/GITBUCKET_DATABASE_NAME/c\\${GITBUCKET_DATABASE_NAME};" $dbfile
-sed -i "/GITBUCKET_DATABASE_HOST/c\\${GITBUCKET_DATABASE_HOST};" $dbfile
-sed -i "/GITBUCKET_DATABASE_PASSWORD/c\\${GITBUCKET_DATABASE_PASSWORD};" $dbfile
-sed -i "/GITBUCKET_DATABASE_USER/c\\${GITBUCKET_DATABASE_USER};" $dbfile
+sed -i "s/GITBUCKET_DATABASE_NAME/${GITBUCKET_DATABASE_NAME}/" $dbfile
+sed -i "s/GITBUCKET_DATABASE_HOST/${GITBUCKET_DATABASE_HOST}/" $dbfile
+sed -i "s/GITBUCKET_DATABASE_PASSWORD/${GITBUCKET_DATABASE_PASSWORD}/" $dbfile
+sed -i "s/GITBUCKET_DATABASE_USER/${GITBUCKET_DATABASE_USER}/" $dbfile
 
+exec "$@"