diff --git a/Dockerfile b/Dockerfile
index d2c5c95..b996c8d 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/DistroOmega/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 efa641f..4d8ccf9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,4 +3,4 @@ terasology:
   ports:
     - 25777:25777
   volumes:
-    - /mnt/data/docker/terasology:/terasology/server
+    - ./terasology:/terasology/server