diff --git a/alpine3.8/Dockerfile b/alpine3.8/Dockerfile
index ac330fee71..4381aa0926 100644
--- a/alpine3.8/Dockerfile
+++ b/alpine3.8/Dockerfile
@@ -7,23 +7,21 @@ RUN apk add --no-cache --update                                   \
             go                                                    \
             linux-headers                                         \
             make                                                  \
-            musl-dev            
-             
-
-RUN git clone --depth 1 https://github.com/ethereum/go-ethereum &&\
-    cd go-ethereum                                              &&\
+            musl-dev                                            &&\  
+    #Clone
+    git clone --depth 1 https://github.com/ethereum/go-ethereum &&\
+    cd /go-ethereum                                             &&\
     make geth                                                   &&\
-    cp go-ethereum/build/bin/geth /geth
-    
-    
-RUN apk del                                                       \
+    cp /go-ethereum/build/bin/geth /geth                        &&\
+    #CleanUp
+    apk del                                                       \
         gcc                                                       \
         git                                                       \
         go                                                        \
         linux-headers                                             \
         make                                                      \
         musl-dev                                                &&\
-        rm -rf /go-ethereum                                     &&\
+        rm -rf ~/go-ethereum                                    &&\
         rm -rf /var/cache/apk/*
 
 EXPOSE 8545
diff --git a/ubuntu-xenial/Dockerfile b/ubuntu-xenial/Dockerfile
new file mode 100644
index 0000000000..8a0cd07449
--- /dev/null
+++ b/ubuntu-xenial/Dockerfile
@@ -0,0 +1,35 @@
+FROM ubuntu:xenial
+
+ENV PATH=/usr/lib/go-1.10/bin:$PATH
+
+RUN apt-get update                              &&\
+    apt-get upgrade -q -y                       &&\
+    apt-get install -y --no-install-recommends    \
+    ca-certificates                               \
+    gcc                                           \
+    git                                           \
+    golang-1.10                                   \
+    libc-dev                                      \
+    make                                        &&\
+    #Clone and build    
+    git clone --depth 1                           \
+        https://github.com/ethereum/go-ethereum &&\
+    cd /go-ethereum                             &&\
+    make geth                                   &&\
+    cp /go-ethereum/build/bin/geth /geth        &&\
+    #Cleanup
+    apt-get remove -y                             \
+    golang-1.10                                   \
+            git                                   \
+            make                                  \
+            gcc                                   \
+            libc-dev                            &&\
+    apt-get autoremove -y                       &&\
+    apt-get clean                               &&\
+    rm -rf /go-ethereum            
+
+EXPOSE 8545
+EXPOSE 30303
+
+ENTRYPOINT ["/geth"]
+