diff --git a/Dockerfile b/Dockerfile
index c311a3b6b..cb6839911 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,12 +2,20 @@ FROM java:8
 
 MAINTAINER Timo Pagel <dependencycheckmaintainer@timo-pagel.de>
 
-RUN wget -O /tmp/current.txt http://jeremylong.github.io/DependencyCheck/current.txt && current=$(cat /tmp/current.txt) && wget https://dl.bintray.com/jeremy-long/owasp/dependency-check-$current-release.zip && unzip dependency-check-$current-release.zip && mv dependency-check /usr/share/
+RUN wget -O /tmp/current.txt http://jeremylong.github.io/DependencyCheck/current.txt && \
+ current=$(cat /tmp/current.txt) && \
+ wget https://dl.bintray.com/jeremy-long/owasp/dependency-check-$current-release.zip && \
+ unzip dependency-check-$current-release.zip && \
+ mv dependency-check /usr/share/
+
+RUN useradd -ms /bin/bash dockeruser && \
+ chown -R dockeruser:dockeruser /usr/share/dependency-check && \
+ mkdir /report && \
+ chown -R dockeruser:dockeruser /report
 
-RUN useradd -ms /bin/bash dockeruser && chown -R dockeruser:dockeruser /usr/share/dependency-check && mkdir /report && chown -R dockeruser:dockeruser /report
 USER dockeruser
 
-VOLUME "/src /usr/share/dependency-check/data /report"
+VOLUME ["/src" "/usr/share/dependency-check/data" "/report"]
 
 WORKDIR /report