diff --git a/Dockerfile b/Dockerfile
index a7066a111..06cb1815d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,31 @@
 # build stage
-FROM golang:alpine AS build-env
-RUN apk --no-cache add build-base git bzr mercurial gcc
+# FROM golang:alpine
+FROM fnproject/dind
+RUN apk add --no-cache ca-certificates build-base go git bzr mercurial gcc
+
+ENV GOPATH=/go
 ENV D=/go/src/github.com/fnproject/fn
 # If dep ever gets decent enough to use, try `dep ensure --vendor-only` from here: https://medium.com/travis-on-docker/triple-stage-docker-builds-with-go-and-angular-1b7d2006cb88
-# IF WE DO GLIDE INSTALL THEN THE DEPS DON'T MATCH WHAT WE HAVE IN GIT!!!!!!!
-# IF WE DO GLIDE INSTALL THEN THE DEPS DON'T MATCH WHAT WE HAVE IN GIT!!!!!!!
-# IF WE DO GLIDE INSTALL THEN THE DEPS DON'T MATCH WHAT WE HAVE IN GIT!!!!!!!
-# IF WE DO GLIDE INSTALL THEN THE DEPS DON'T MATCH WHAT WE HAVE IN GIT!!!!!!!
-# IF WE DO GLIDE INSTALL THEN THE DEPS DON'T MATCH WHAT WE HAVE IN GIT!!!!!!!
-# IF WE DO GLIDE INSTALL THEN THE DEPS DON'T MATCH WHAT WE HAVE IN GIT!!!!!!!
-# IF WE DO GLIDE INSTALL THEN THE DEPS DON'T MATCH WHAT WE HAVE IN GIT!!!!!!!
-# IF WE DO GLIDE INSTALL THEN THE DEPS DON'T MATCH WHAT WE HAVE IN GIT!!!!!!!
 #RUN go get -u github.com/Masterminds/glide
 #ADD glide.* $D/
 #RUN cd $D && glide install -v
 
 ADD . $D
-RUN cd $D && go build -o fn-alpine && cp fn-alpine /tmp/
+# RUN cd $D && go build -o fn-alpine && cp fn-alpine /tmp/
+# TODO: ADD BACK-  RUN cd $D && go build -o /app/functions
 
 # final stage
-FROM fnproject/dind
+# FROM fnproject/dind
 WORKDIR /app
-COPY --from=build-env /tmp/fn-alpine /app/functions
+# COPY --from=build-env /tmp/fn-alpine /app/functions
 CMD ["./functions"]
+
+# For building extensions
+ONBUILD ARG REPO
+ONBUILD RUN echo "YOOOO $DIR"
+ONBUILD RUN echo $REPO
+# ONBUILD ENV GOPATH=$GOPATH:$DIR
+# ONBUILD RUN echo $GOPATH
+ONBUILD ADD . $GOPATH/src/$REPO
+ONBUILD ADD main.go $D
+ONBUILD RUN cd $D && go build -o /app/functions
diff --git a/images/dind/Dockerfile b/images/dind/Dockerfile
index ca07e2b5e..3ceb25ed9 100644
--- a/images/dind/Dockerfile
+++ b/images/dind/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:edge-dind
+FROM docker:17.09-dind
 
 RUN apk add --no-cache ca-certificates
 
diff --git a/images/dind/VERSION b/images/dind/VERSION
index 446ba66e7..def9a0154 100644
--- a/images/dind/VERSION
+++ b/images/dind/VERSION
@@ -1 +1 @@
-0.1.4
\ No newline at end of file
+0.1.5
\ No newline at end of file