diff --git a/Dockerfile b/Dockerfile
index 9b1f17c..88dc0fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER Marcel Otte <qwc+docker@mmo.to>
-RUN apt-get update && apt-get install -y openjdk-8-jre wget unzip
+RUN apt-get update && apt-get install -y openjdk-11-jre wget unzip
 RUN mkdir /terasology \
     && wget -P /terasology http://jenkins.terasology.org/job/DistroOmegaRelease/lastSuccessfulBuild/artifact/distros/omega/build/distributions/TerasologyOmega.zip \
     && unzip /terasology/TerasologyOmega.zip -d /terasology \
diff --git a/docker-compose.yml b/docker-compose.yml
index 894e49b..e83e708 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,8 @@
-terasology:
-  image: qwick/terasology:latest
-  ports:
-    - 25777:25777
-  volumes:
-    - /mnt/data/docker/terasology:/terasology/server
+version: '2'
+services:
+    terasology:
+      image: qwick/terasology:latest
+      ports:
+        - 25777:25777
+      volumes:
+        - ./terasology:/terasology/server