diff --git a/Dockerfile b/Dockerfile
index da7b797e9..e33f603fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,22 @@
 FROM ubuntu:16.04
 
-
+# Docker
 RUN apt-get update && apt-get install -y \
-    wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev \
-    git make g++ file perl bash binutils locales qemu-utils
+        apt-transport-https \
+        ca-certificates \
+        curl \
+        software-properties-common \
+    && rm -rf /var/lib/apt/lists/* \
+    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
+    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+    && apt-get update && apt-get install -y docker-ce \
+    && rm -rf /var/lib/apt/lists/*
+
+# Build Tools
+RUN apt-get update && apt-get install -y \
+        wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev \
+        git make g++ file perl bash binutils locales qemu-utils \
+    && rm -rf /var/lib/apt/lists/*
 
 # Get buildroot
 WORKDIR /build