diff --git a/Dockerfile b/Dockerfile
index 74aa8a97323948ddf8e519d036c0e295f9fc3b42..664d3b368720f393b342971e3dbb2ac2d04e3f83 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -100,6 +100,18 @@ RUN groupadd --gid 1000 ubuntu \
 
 RUN chmod -R a+rw /usr
 
+# Docker client and group
+
+RUN groupadd -g 999 docker
+RUN usermod -aG docker ubuntu
+
+ENV DOCKER_VERSION=18.09.2
+
+RUN curl -fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz \
+  && tar xzvf docker-${DOCKER_VERSION}.tgz --strip 1 \
+                 -C /usr/local/bin docker/docker \
+  && rm docker-${DOCKER_VERSION}.tgz
+
 USER ubuntu
 
 # Pipenv