diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..378eac25
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+build
diff --git a/Dockerfile b/Dockerfile
index a3cc326a..b5cf9ad5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,25 @@
-FROM phusion/baseimage:0.9.19
+FROM ubuntu:18.04
 MAINTAINER PeerPlays Blockchain Standards Association
 
 ENV LANG=en_US.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
 RUN \
     apt-get update -y && \
     apt-get install -y \
-      g++ \
       autoconf \
+      build-essential \
+      ca-certificates \
       cmake \
+      doxygen \
       git \
       libbz2-dev \
-      libreadline-dev \
-      libboost-all-dev \
       libcurl4-openssl-dev \
-      libssl-dev \
       libncurses-dev \
-      doxygen \
-      ca-certificates \
+      libreadline-dev \
+      libssl-dev \
+      libtool \
+      ntp \
+      wget \
     && \
     apt-get update -y && \
     apt-get install -y fish && \
@@ -28,17 +31,21 @@ WORKDIR /peerplays-core
 
 # Compile
 RUN \
-    ( git submodule sync --recursive || \
-      find `pwd`  -type f -name .git | \
-	while read f; do \
-	  rel="$(echo "${f#$PWD/}" | sed 's=[^/]*/=../=g')"; \
-	  sed -i "s=: .*/.git/=: $rel/=" "$f"; \
-	done && \
-      git submodule sync --recursive ) && \
     git submodule update --init --recursive && \
+    BOOST_ROOT=$HOME/boost_1_67_0 && \
+    wget -c 'http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.tar.gz/download' -O boost_1_67_0.tar.gz &&\
+    tar -zxvf boost_1_67_0.tar.gz && \
+    cd boost_1_67_0/ && \
+    ./bootstrap.sh "--prefix=$BOOST_ROOT" && \
+    ./b2 install && \
+    cd .. && \
+    mkdir build && \
+    mkdir build/release && \
+    cd build/release && \
     cmake \
+        -DBOOST_ROOT="$BOOST_ROOT" \
         -DCMAKE_BUILD_TYPE=Release \
-        . && \
+        ../.. && \
     make witness_node cli_wallet && \
     install -s programs/witness_node/witness_node programs/cli_wallet/cli_wallet /usr/local/bin && \
     #