diff --git a/Dockerfile b/Dockerfile
index e0a679b..b2e0ce8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,24 +8,25 @@
 # RUN:
 #   docker run -e VMPOOLER_CONFIG -p 80:4567 -it vmpooler
 
-FROM jruby:1.7-jdk
+FROM jruby:9.1-jdk
+
+RUN mkdir -p /var/lib/vmpooler && mkdir /var/log/vmpooler
 
-RUN mkdir -p /var/lib/vmpooler
 WORKDIR /var/lib/vmpooler
 
-ADD Gemfile* /var/lib/vmpooler
+ADD Gemfile* /var/lib/vmpooler/
 RUN bundle install --system
 
 RUN ln -s /opt/jruby/bin/jruby /usr/bin/jruby
 
 RUN echo "deb http://httpredir.debian.org/debian jessie main" >/etc/apt/sources.list.d/jessie-main.list
-RUN apt-get update
-RUN apt-get install -y redis-server
+RUN apt-get update && apt-get install -y redis-server && rm -rf /var/lib/apt/lists/*
 
 COPY . /var/lib/vmpooler
 
-ENTRYPOINT \
+ENV VMPOOLER_LOG /var/log/vmpooler.log
+CMD \
     /etc/init.d/redis-server start \
     && /var/lib/vmpooler/scripts/vmpooler_init.sh start \
-    && while [ ! -f /var/log/vmpooler.log ]; do sleep 1; done ; \
-    tail -f /var/log/vmpooler.log
+    && while [ ! -f ${VMPOOLER_LOG} ]; do sleep 1; done ; \
+    tail -f ${VMPOOLER_LOG}