diff --git a/Dockerfile b/Dockerfile
index 87342f2649..f69d67c15b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 # vim:ft=dockerfile
-FROM ubuntu:16.04
+
+FROM ubuntu:18.04
 
 RUN apt-get update && apt-get -y install \
     g++ \
     cmake libgmp-dev libmpfr-dev libmpc-dev libboost-all-dev bison \
     zlib1g-dev \
     perl texinfo
-    
-RUN mkdir /root/Retro68
-COPY . /root/Retro68/
 
-RUN mkdir /root/Retro68-build
+ADD . /Retro68
 
-RUN sh -c "cd /root/Retro68-build && sh ../Retro68/build-toolchain.sh --clean-after-build"
\ No newline at end of file
+RUN mkdir /Retro68-build
+
+RUN bash -c "cd /Retro68-build && bash /Retro68/build-toolchain.bash --clean-after-build"