diff --git a/Dockerfile b/Dockerfile
index 948a32e..2326146 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM ubuntu:14.04
+FROM ubuntu:15.10
 MAINTAINER Marcel Otte <qwc+docker@mmo.to>
-RUN apt-get update && apt-get install -y openjdk-7-jre-headless
-RUN apt-get install -y wget unzip
+RUN apt-get update && apt-get install -y openjdk-8-jre-headless wget unzip
+#RUN apt-get install -y wget unzip
 RUN mkdir /terasology
-RUN wget -P /terasology http://jenkins.terasology.org/job/TerasologyStable/lastSuccessfulBuild/artifact/build/distributions/Terasology.zip
-RUN unzip /terasology/Terasology.zip -d /terasology
+RUN wget -P /terasology http://jenkins.terasology.org/job/DistroOmegaRelease/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip
+RUN unzip /terasology/TerasologyOmega.zip -d /terasology
 ENTRYPOINT java -jar /terasology/libs/Terasology.jar -headless -homedir=/terasology/server
 VOLUME /terasology/server
 EXPOSE 25777
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..894e49b
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,6 @@
+terasology:
+  image: qwick/terasology:latest
+  ports:
+    - 25777:25777
+  volumes:
+    - /mnt/data/docker/terasology:/terasology/server