diff --git a/Gopkg.lock b/Gopkg.lock
index 711e16f..90ddfad 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -7,12 +7,6 @@
   revision = "78439966b38d69bf38227fbf57ac8a6fee70f69a"
   version = "v0.4.5"
 
-[[projects]]
-  name = "github.com/Sirupsen/logrus"
-  packages = ["."]
-  revision = "a3f95b5c423586578a4e099b11a46c2479628cac"
-  version = "1.0.2"
-
 [[projects]]
   name = "github.com/coreos/go-systemd"
   packages = ["activation"]
@@ -22,8 +16,7 @@
 [[projects]]
   name = "github.com/docker/go-connections"
   packages = ["sockets"]
-  revision = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"
-  version = "v0.2.1"
+  revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"
 
 [[projects]]
   branch = "master"
@@ -61,12 +54,6 @@
   packages = ["."]
   revision = "d0303fe809921458f417bcf828397a65db30a7e4"
 
-[[projects]]
-  name = "github.com/opencontainers/runc"
-  packages = ["libcontainer/user"]
-  revision = "baf6536d6259209c3edfa2b22237af82942d3dfa"
-  version = "v0.1.1"
-
 [[projects]]
   name = "github.com/pelletier/go-buffruneio"
   packages = ["."]
@@ -80,10 +67,10 @@
   version = "v1.0.0"
 
 [[projects]]
+  branch = "master"
   name = "github.com/sirupsen/logrus"
   packages = ["."]
-  revision = "a3f95b5c423586578a4e099b11a46c2479628cac"
-  version = "1.0.2"
+  revision = "181d419aa9e2223811b824e8f0b4af96f9ba9302"
 
 [[projects]]
   branch = "master"
@@ -121,6 +108,12 @@
   packages = ["."]
   revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7"
 
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["ssh/terminal"]
+  revision = "b176d7def5d71bdd214203491f89843ed217f420"
+
 [[projects]]
   branch = "master"
   name = "golang.org/x/net"
@@ -148,6 +141,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "c85ec5ad98317e75dd73ae7b42cc27eea1af0831b6055a34f01a814f40669e73"
+  inputs-digest = "ed8a3da3e6102cf2c992cd34137c1c3758f22ed076b32c63d69e4d26693745be"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index d00296a..76b1c50 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -1,33 +1,11 @@
 
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#  name = "github.com/x/y"
-#  version = "2.4.0"
-
-
 [[constraint]]
   branch = "master"
   name = "github.com/docker/go-plugins-helpers"
 
 [[constraint]]
+  branch = "master"
   name = "github.com/sirupsen/logrus"
-  version = "1.0.2"
 
 [[constraint]]
   branch = "master"
@@ -36,3 +14,12 @@
 [[constraint]]
   branch = "master"
   name = "github.com/spf13/viper"
+
+[[override]]
+  version = "1.0.0-rc4"
+  name = "github.com/opencontainers/runc"
+
+[[override]]
+  revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+  name = "github.com/docker/go-connections"
+
diff --git a/Makefile b/Makefile
index 53a798c..718d3aa 100644
--- a/Makefile
+++ b/Makefile
@@ -138,11 +138,11 @@ test: deps format
 	go test -v -race -coverprofile=coverage.out -covermode=atomic ./gvfs/drivers
 	go tool cover -html=coverage.out -o coverage.html
 
-docs:
+docs: deps
 	@echo -e "$(OK_COLOR)==> Serving docs at http://localhost:$(DOC_PORT).$(NO_COLOR)"
 	@godoc -http=:$(DOC_PORT)
 
-lint: dev-deps
+lint: deps
 	gometalinter --deadline=5m --concurrency=2 --vendor --disable=gotype --errors ./...
 	gometalinter --deadline=5m --concurrency=2 --vendor --disable=gotype ./... || echo "Something could be improved !"
 #	gometalinter --deadline=5m --concurrency=2 --vendor ./... # disable gotype temporary
@@ -165,7 +165,7 @@ update-dev-deps:
 
 deps: dev-deps
 	@echo -e "$(OK_COLOR)==> Installing dependencies ...$(NO_COLOR)"
-	$(GOPATH)/bin/dep ensure
+	$(GOPATH)/bin/dep ensure -vendor-only
 
 update-deps: dev-deps
 	@echo -e "$(OK_COLOR)==> Updating all dependencies ...$(NO_COLOR)"
diff --git a/gvfs/gvfs.go b/gvfs/gvfs.go
index 1cc230b..7a93c2e 100644
--- a/gvfs/gvfs.go
+++ b/gvfs/gvfs.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"path/filepath"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/docker/go-plugins-helpers/volume"
 	"github.com/sapk/docker-volume-gvfs/gvfs/drivers"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
index 3bdf27a..98ee577 100644
--- a/support/docker/Dockerfile
+++ b/support/docker/Dockerfile
@@ -1,13 +1,14 @@
 FROM alpine:latest
 MAINTAINER Antoine GIRARD <antoine.girard@sapk.fr>
 
-ENV GOPATH=/usr/share/docker-volume-gvfs
-
-ADD . ${GOPATH}
+ENV GOPATH=/go
 
 RUN apk --no-cache --no-progress --force add \
-          build-tools make gcc go musl-dev git ca-certificates dbus dbus-x11 gvfs gvfs-fuse gvfs-dav gvfs-smb openssh-client\
- && cd $GOPATH && make \
+          build-tools make gcc go musl-dev git ca-certificates dbus dbus-x11 gvfs gvfs-fuse gvfs-dav gvfs-smb openssh-client
+
+ADD . ${GOPATH}/src/github.com/sapk/docker-volume-gvfs
+
+RUN cd $GOPATH/src/github.com/sapk/docker-volume-gvfs && make \
  && mv ./docker-volume-gvfs /usr/bin/docker-volume-gvfs \
  && cd && mkdir -p /var/lib/docker-volumes/gvfs /root/.ssh \
  && apk del --purge build-tools make gcc go musl-dev git \