diff --git a/Dockerfile b/Dockerfile
index 0dfae96..87bfd0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,25 @@
-FROM tomcat:alpine
-COPY target/smeagol-*-standalone.war $CATALINA_HOME/webapps/smeagol.war
+FROM alpine:3.6
+
+MAINTAINER Simon Brooke <simon@journeyman.cc>
+
+ENV JAVA_HOME=/usr/lib/jvm/default-jvm
+
+RUN apk add --no-cache openjdk7 && \
+    ln -sf "${JAVA_HOME}/bin/"* "/usr/bin/"
+
+# ensure the directories I'm going to write to actually exist!
+RUN mkdir -p /usr/local/bin
+RUN mkdir -p /usr/local/etc
+
+COPY target/smeagol-*-standalone.jar /usr/local/bin/smeagol.jar
+COPY resources/passwd /usr/local/etc/passwd
+COPY resources/config.edn /usr/local/etc/config.edn
+COPY resources/pubilc/content /usr/local/etc/content
+
+ENV SMEAGOL_CONFIG=/usr/local/etc/config.edn
+ENV SMEAGOL_CONTENT_DIR=/usr/local/etc/content
+ENV SMEAGOL_PASSWD=/usr/local/etc/passwd
+ENV TIMBRE_DEFAULT_STACKTRACE_FONTS="{}"
+
+CMD java -jar /usr/local/bin/smeagol.jar
 
diff --git a/resources/public/uploads/water.png b/resources/public/uploads/water.png
deleted file mode 100644
index e97d1ed..0000000
Binary files a/resources/public/uploads/water.png and /dev/null differ