diff --git a/Makefile b/Makefile
index 603bed7..e6cbc91 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ docker-plugin: docker-rootfs docker-plugin-create
 
 docker-image:
 	@echo -e "$(OK_COLOR)==> Docker build image : ${PLUGIN_IMAGE} $(NO_COLOR)"
-	@docker build -q -t ${PLUGIN_IMAGE} support/docker
+	docker build -t ${PLUGIN_IMAGE} -f support/docker/Dockerfile .
 
 docker-rootfs: docker-image
 	@echo -e "$(OK_COLOR)==> create rootfs directory in ./plugin/rootfs$(NO_COLOR)"
@@ -59,15 +59,15 @@ docker-plugin-create:
 	@echo -e "$(OK_COLOR)==> Remove existing plugin : ${PLUGIN_IMAGE} if exists$(NO_COLOR)"
 	@docker plugin rm -f ${PLUGIN_IMAGE} || true
 	@echo -e "$(OK_COLOR)==> Create new plugin : ${PLUGIN_IMAGE} from ./plugin$(NO_COLOR)"
-	@docker plugin create ${PLUGIN_IMAGE} ./plugin
+	docker plugin create ${PLUGIN_IMAGE} ./plugin
 
 docker-plugin-push:
 	@echo -e "$(OK_COLOR)==> push plugin : ${PLUGIN_IMAGE}$(NO_COLOR)"
-	@docker plugin push ${PLUGIN_IMAGE}
+	docker plugin push ${PLUGIN_IMAGE}
 
 docker-plugin-enable:
 	@echo -e "$(OK_COLOR)==> Enable plugin ${PLUGIN_IMAGE}$(NO_COLOR)"
-	@docker plugin enable ${PLUGIN_IMAGE}
+	docker plugin enable ${PLUGIN_IMAGE}
 
 set-build:
 	@if [ ! -d $(PWD)/.gopath/src/$(APP_USERREPO) ]; then mkdir -p $(PWD)/.gopath/src/$(APP_USERREPO); fi
diff --git a/gvfs/drivers/dav_test.go b/gvfs/drivers/dav_test.go
index 42ea5f6..bad8b46 100644
--- a/gvfs/drivers/dav_test.go
+++ b/gvfs/drivers/dav_test.go
@@ -26,7 +26,7 @@ func TestDAVURLSSL(t *testing.T) {
 	tmp := DavVolumeDriver{url: u}
 	m, err := tmp.mountpoint()
 	if err != nil || m != expected {
-		t.Error("Expected ", expected,", got ", m, err)
+		t.Error("Expected ", expected, ", got ", m, err)
 	}
 }
 
@@ -36,7 +36,7 @@ func TestDAVURLSSLTraillingSlash(t *testing.T) {
 	tmp := DavVolumeDriver{url: u}
 	m, err := tmp.mountpoint()
 	if err != nil || m != expected {
-		t.Error("Expected ", expected,", got ", m, err)
+		t.Error("Expected ", expected, ", got ", m, err)
 	}
 }
 
@@ -46,7 +46,7 @@ func TestDAVURLSSLUser(t *testing.T) {
 	tmp := DavVolumeDriver{url: u}
 	m, err := tmp.mountpoint()
 	if err != nil || m != expected {
-		t.Error("Expected ", expected,", got ", m, err)
+		t.Error("Expected ", expected, ", got ", m, err)
 	}
 }
 
@@ -56,7 +56,7 @@ func TestDAVURLSSLDefaultPort(t *testing.T) {
 	tmp := DavVolumeDriver{url: u}
 	m, err := tmp.mountpoint()
 	if err != nil || m != expected {
-		t.Error("Expected ", expected,", got ", m, err)
+		t.Error("Expected ", expected, ", got ", m, err)
 	}
 }
 
@@ -66,7 +66,7 @@ func TestDAVURLSSLCustomPort(t *testing.T) {
 	tmp := DavVolumeDriver{url: u}
 	m, err := tmp.mountpoint()
 	if err != nil || m != expected {
-		t.Error("Expected ", expected,", got ", m, err)
+		t.Error("Expected ", expected, ", got ", m, err)
 	}
 }
 
@@ -76,7 +76,7 @@ func TestDAVURLDefault(t *testing.T) {
 	tmp := DavVolumeDriver{url: u}
 	m, err := tmp.mountpoint()
 	if err != nil || m != expected {
-		t.Error("Expected ", expected,", got ", m, err)
+		t.Error("Expected ", expected, ", got ", m, err)
 	}
 }
 
@@ -86,7 +86,7 @@ func TestDAVURLUser(t *testing.T) {
 	tmp := DavVolumeDriver{url: u}
 	m, err := tmp.mountpoint()
 	if err != nil || m != expected {
-		t.Error("Expected ", expected,", got ", m, err)
+		t.Error("Expected ", expected, ", got ", m, err)
 	}
 }
 
@@ -96,7 +96,7 @@ func TestDAVURLDefaultPort(t *testing.T) {
 	tmp := DavVolumeDriver{url: u}
 	m, err := tmp.mountpoint()
 	if err != nil || m != expected {
-		t.Error("Expected ", expected,", got ", m, err)
+		t.Error("Expected ", expected, ", got ", m, err)
 	}
 }
 
@@ -106,7 +106,7 @@ func TestDAVURLIP(t *testing.T) {
 	tmp := DavVolumeDriver{url: u}
 	m, err := tmp.mountpoint()
 	if err != nil || m != expected {
-		t.Error("Expected ", expected,", got ", m, err)
+		t.Error("Expected ", expected, ", got ", m, err)
 	}
 }
 func TestDAVURLCustomPort(t *testing.T) {
@@ -115,6 +115,6 @@ func TestDAVURLCustomPort(t *testing.T) {
 	tmp := DavVolumeDriver{url: u}
 	m, err := tmp.mountpoint()
 	if err != nil || m != expected {
-		t.Error("Expected ", expected,", got ", m, err)
+		t.Error("Expected ", expected, ", got ", m, err)
 	}
 }
diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
index 6b3a96c..f1e422a 100644
--- a/support/docker/Dockerfile
+++ b/support/docker/Dockerfile
@@ -1,16 +1,16 @@
 FROM alpine:latest
 MAINTAINER Antoine GIRARD <antoine.girard@sapk.fr>
 
-ENV GOPATH="/usr/share/docker-volume-gvfs"
+ENV GOPATH=/usr/share/docker-volume-gvfs
+
+ADD . ${GOPATH}
 
 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\
- && git clone https://github.com/sapk/docker-volume-gvfs.git /usr/share/docker-volume-gvfs \
- && cd /usr/share/docker-volume-gvfs && make \
+ && cd $GOPATH && make \
  && mv ./docker-volume-gvfs /usr/bin/docker-volume-gvfs \
- && cd && rm -r /usr/share/docker-volume-gvfs \
+ && cd && mkdir -p /var/lib/docker-volumes/gvfs \
  && apk del --purge build-tools make gcc go musl-dev git \
- && mkdir -p /var/lib/docker-volumes/gvfs \
  && rm -rf $GOPATH /var/cache/apk/*
 
 ENTRYPOINT [ "/usr/bin/docker-volume-gvfs" ]