diff --git a/Dockerfile b/Dockerfile
index 36ac9d6..2393451 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,8 @@ VOLUME ["/teamspeak3"]
 RUN apt-get update && apt-get install -y curl
 
 # Download TS3 file and extract it into /opt.
-RUN cd /opt && curl -sL ${TEAMSPEAK_URL} | tar xz
+RUN cd /opt && \
+  curl -sL ${TEAMSPEAK_URL} | tar xz
 
 # TODO create symlink for the sqlite db
 #RUN cd /teamspeak3 && touch ts3server.sqlitedb
@@ -29,11 +30,16 @@ RUN cd /opt && curl -sL ${TEAMSPEAK_URL} | tar xz
 #RUN cd /teamspeak3 && mkdir files && ln -s /teamspeak3/files /opt/teamspeak3-server_linux-amd64/files
 
 # TODO Use CMD to set some defaults, for example mapping some files/directorys to the injected volume.
-CMD ["logpath='/teamspeak3/logs/'"]
-# licensepath='/teamspeak3/' inifile='/teamspeak3/ts3server.ini' query_ip_whitelist='/teamspeak3/query_ip_whitelist.txt' query_ip_backlist='/teamspeak3/query_ip_blacklist.txt'"]
+#CMD ["logpath='/teamspeak3/logs/'"]
+# licensepath='/teamspeak3/' inifile='/teamspeak3/ts3server.ini' "]
 
 # Specify an entrypoint because this container should act like a isolated "application" and only serve TS3.
-ENTRYPOINT /opt/teamspeak3-server_linux-amd64/ts3server_minimal_runscript.sh query_ip_whitelist="/teamspeak3/query_ip_whitelist.txt"
+ENTRYPOINT /opt/teamspeak3-server_linux-amd64/ts3server_minimal_runscript.sh \
+  query_ip_whitelist="/teamspeak3/query_ip_whitelist.txt" \
+  query_ip_backlist="/teamspeak3/query_ip_blacklist.txt" \
+  logpath="/teamspeak3/logs/" \
+  licensepath="/teamspeak3/"
+  
 
 # Expose the Standard TS3 port.
 EXPOSE 9987/udp