diff --git a/Dockerfile b/Dockerfile
index e2ae4042b..4dd64865e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15-buster as secretless-builder
+FROM golang:1.16-buster as secretless-builder
 MAINTAINER CyberArk Software Ltd.
 LABEL builder="secretless-builder"
 
@@ -23,6 +23,7 @@ ENV GOOS=linux \
 COPY go.mod go.sum /secretless/
 COPY third_party/ /secretless/third_party
 
+RUN go env -w GOFLAGS=-mod=mod
 RUN go mod download
 
 # secretless source files
diff --git a/Dockerfile.debug b/Dockerfile.debug
index 15e866929..08d459185 100644
--- a/Dockerfile.debug
+++ b/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.15-buster as secretless-builder
+FROM golang:1.16-buster as secretless-builder
 MAINTAINER CyberArk Software Ltd.
 LABEL builder="secretless-builder"
 
@@ -23,6 +23,7 @@ ENV GOOS=linux \
 COPY go.mod go.sum /secretless/
 COPY third_party/ /secretless/third_party
 
+RUN go env -w GOFLAGS=-mod=mod
 RUN go mod download
 
 # Compile Delve (for debugging)
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 7f3d4d4e6..4dc1a6198 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM golang:1.15-buster
+FROM golang:1.16-buster
 MAINTAINER CyberArk Software Ltd.
 
 # On CyberArk dev laptops, golang module dependencies are downloaded with a
@@ -53,6 +53,7 @@ RUN go get -u github.com/jstemmer/go-junit-report && \
 COPY go.mod go.sum /secretless/
 COPY third_party/ /secretless/third_party
 
+RUN go env -w GOFLAGS=-mod=mod
 RUN go mod download
 
 # TODO: all the stuff below this line is not needed
diff --git a/Dockerfile.test b/Dockerfile.test
index c280708b3..a4ce50dd5 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine
+FROM golang:1.16-alpine
 MAINTAINER CyberArk Software Ltd.
 LABEL id="secretless-test-runner"
 
@@ -24,6 +24,7 @@ RUN apk add -u curl \
 COPY go.mod go.sum /secretless/
 COPY third_party/ /secretless/third_party
 
+RUN go env -w GOFLAGS=-mod=mod
 RUN go mod download
 
 # go-junit-report => Convert go test output to junit xml
diff --git a/go.mod b/go.mod
index ee233ee8d..8d4988372 100644
--- a/go.mod
+++ b/go.mod
@@ -60,4 +60,4 @@ replace github.com/denisenkom/go-mssqldb => ./third_party/go-mssqldb
 // This is our fix:
 replace honnef.co/go/tools => github.com/dominikh/go-tools v0.0.1-2019.2.3
 
-go 1.15
+go 1.16