diff --git a/.profile b/.profile
index 4fd34a7..ac9d1f9 100644
--- a/.profile
+++ b/.profile
@@ -1,3 +1,4 @@
 export PS1='\e[1m\e[31m[\h] \e[32m($(docker-prompt)) \e[34m\u@$(hostname -i)\e[35m \w\e[0m\n$ '
 alias vi='vim'
+export PATH=$PATH:/root/go/bin
 cat /etc/motd
diff --git a/Dockerfile.dind b/Dockerfile.dind
index 2b7378f..8b92f4a 100644
--- a/Dockerfile.dind
+++ b/Dockerfile.dind
@@ -1,8 +1,15 @@
 ARG VERSION=docker:17.05.0-ce-dind
 FROM ${VERSION}
 
-RUN apk add --no-cache git tmux py2-pip apache2-utils vim build-base gettext-dev curl bash-completion bash util-linux jq openssh
+RUN apk add --no-cache git tmux py2-pip apache2-utils vim build-base gettext-dev curl bash-completion bash util-linux jq openssh go \
+    && mkdir /root/go 
 
+ENV GOPATH /root/go
+ENV PATH $PATH:$GOPATH
+
+# Download moby and linuxkit
+
+RUN go get -u github.com/moby/tool/cmd/moby github.com/linuxkit/linuxkit/src/cmd/linuxkit
 
 # Compile and install httping
 # (used in orchestration workshop, and very useful anyway)