diff --git a/build-support/docker/Build-Go.dockerfile b/build-support/docker/Build-Go.dockerfile
index 565600a609..fa67e46716 100644
--- a/build-support/docker/Build-Go.dockerfile
+++ b/build-support/docker/Build-Go.dockerfile
@@ -8,6 +8,14 @@ ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \
    github.com/axw/gocov/gocov \
    gopkg.in/matm/v1/gocov-html"
 
-RUN GO111MODULE=on go get -v ${GOTOOLS} && mkdir -p /consul
+RUN mkdir -p .gotools && \
+    cd .gotools && \
+    for tool in ${GOTOOLS}; do \
+        echo "=== TOOL: ${tool}" ; \
+        rm -rf go.mod go.sum ; \
+        go mod init consul-tools ; \
+        go get -v "${tool}" ; \
+    done && \
+    rm -rf go.mod go.sum
 
 WORKDIR /consul