diff --git a/Dockerfile b/Dockerfile
index b1915afcd..4d73af21e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,9 @@ FROM fnproject/dind
 RUN apk add --no-cache ca-certificates build-base go git bzr mercurial gcc
 
 ENV GOPATH=/go
+RUN env
+ENV PATH=$PATH:/go/bin
+RUN env
 ENV D=/go/src/github.com/fnproject/fn
 
 ADD . $D
@@ -12,6 +15,13 @@ CMD ["./functions"]
 
 # For building extensions
 ONBUILD ARG REPO
-ONBUILD ADD . $GOPATH/src/$REPO
-ONBUILD ADD main.go $D
-ONBUILD RUN cd $D && go build -o /app/functions
+ONBUILD ENV REPOPATH=$GOPATH/src/$REPO
+ONBUILD ADD . $REPOPATH
+# dep just way too slow and error prone... :(
+# It might be a good idea to move interfaces and models to a new repo with minimal depenencies, then this might work nice
+# ONBUILD RUN go get -u github.com/golang/dep/cmd/dep
+# ONBUILD RUN cd $REPOPATH && dep init && dep ensure
+# Try doing regular go get:
+ONBUILD RUN cd $REPOPATH && go get
+# ONBUILD ADD main.go $D
+ONBUILD RUN cd $REPOPATH && go build -o /app/functions