diff --git a/build/build_all.sh b/build/build_all.sh
index cf2384a3..e8954ac8 100755
--- a/build/build_all.sh
+++ b/build/build_all.sh
@@ -22,7 +22,7 @@ if [ "$USE_DOCKER" != "" ]; then
     -v /$(pwd):/src:z \
     -w //src \
     -e COMMIT_SHA=$COMMIT_SHA \
-    filebrowser/dev:mod \
+    filebrowser/dev \
     sh -c "\
       cd build && \
       dos2unix build_assets.sh && \
diff --git a/build/run_gometalinter.sh b/build/run_gometalinter.sh
index 85c33e5e..8ed2fdc0 100755
--- a/build/run_gometalinter.sh
+++ b/build/run_gometalinter.sh
@@ -6,8 +6,10 @@ cd $(dirname $0)/..
 
 dolint='gometalinter --exclude="rice-box.go" --exclude="vendor" --deadline=300s ./...'
 
+WDIR="/go/src/github.com/filebrowser/filebrowser"
+
 if [ "$USE_DOCKER" != "" ]; then
-  $(command -v winpty) docker run --rm -itv /$(pwd)://go/src/github.com/filebrowser/filebrowser -w //go/src/github.com/filebrowser/filebrowser filebrowser/dev:mod sh -c "\
+  $(command -v winpty) docker run --rm -itv "/$(pwd):/$WDIR" -w "/$WDIR" filebrowser/dev sh -c "\
     GO111MODULE=on go get -v ./... && \
     GO111MODULE=on go mod vendor && \
     GO111MODULE=off $dolint"