diff --git a/automation/Dockerfile.ansible b/automation/Dockerfile.ansible
index 4b5a239..7606a61 100644
--- a/automation/Dockerfile.ansible
+++ b/automation/Dockerfile.ansible
@@ -1,21 +1,44 @@
 FROM ubuntu:14.04
 
-RUN apt-get update -y && \
-    sudo apt-get install -y  software-properties-common && \
-    apt-add-repository ppa:ansible/ansible && \
-    apt-get update -y && \
-    apt-get install -y git ansible golang
+# Base image information borrowed by official golang wheezy Dockerfile
+RUN apt-get update && apt-get install -y --no-install-recommends \
+		g++ \
+		gcc \
+		libc6-dev \
+		make \
+                curl \
+	&& rm -rf /var/lib/apt/lists/*
 
-RUN mkdir /go
-WORKDIR /go
-ENV GOPATH=/go
+ENV GOLANG_VERSION 1.6.2
+ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
+ENV GOLANG_DOWNLOAD_SHA256 e40c36ae71756198478624ed1bb4ce17597b3c19d243f3f0899bb5740d56212a
+
+RUN curl -kfsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
+	&& echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
+	&& tar -C /usr/local -xzf golang.tar.gz \
+	&& rm golang.tar.gz
+
+ENV GOPATH /go
+ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
+
+RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
+
+# CORD Automation Dockerfile
+WORKDIR $GOPATH
+
+RUN apt-get update && \
+	apt-get install -y  software-properties-common && \
+	apt-add-repository ppa:ansible/ansible && \
+	apt-get update -y  -m && \
+	apt-get install -y git ansible
+
 RUN go get github.com/tools/godep
-ADD . /go/src/github.com/ciena/cord-maas-automation
+ADD . $GOPATH/src/github.com/ciena/cord-maas-automation
 
-WORKDIR /go/src/github.com/ciena/cord-maas-automation
-RUN /go/bin/godep restore
+WORKDIR $GOPATH/src/github.com/ciena/cord-maas-automation
+RUN $GOPATH/bin/godep restore
 
-WORKDIR /go
+WORKDIR $GOPATH
 RUN go install github.com/ciena/cord-maas-automation
 
-ENTRYPOINT ["/go/bin/cord-maas-automation"]
+ENTRYPOINT ["$GOPATH/bin/cord-maas-automation"]