diff --git a/auth/basic-auth/Dockerfile b/auth/basic-auth/Dockerfile
index 2506484b..b35f0f13 100644
--- a/auth/basic-auth/Dockerfile
+++ b/auth/basic-auth/Dockerfile
@@ -1,4 +1,6 @@
-FROM golang:1.11-alpine3.10 as build
+FROM golang:1.12-alpine3.11 as build
+
+ENV GO111MODULE=off
 ENV CGO_ENABLED=0
 
 RUN apk add --no-cache curl ca-certificates
diff --git a/auth/basic-auth/Dockerfile.arm64 b/auth/basic-auth/Dockerfile.arm64
index 2e647dc0..0209ea0b 100644
--- a/auth/basic-auth/Dockerfile.arm64
+++ b/auth/basic-auth/Dockerfile.arm64
@@ -1,4 +1,7 @@
-FROM golang:1.10-alpine3.9 as build
+FROM golang:1.12-alpine3.11 as build
+
+ENV GO111MODULE=off
+ENV CGO_ENABLED=0
 
 RUN apk add --no-cache curl ca-certificates gcc musl-dev
 RUN curl -sLSf https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh \
diff --git a/gateway/Dockerfile b/gateway/Dockerfile
index 5332e7b7..d4c7e77f 100644
--- a/gateway/Dockerfile
+++ b/gateway/Dockerfile
@@ -1,11 +1,12 @@
-FROM golang:1.11 as build
+FROM golang:1.12 as build
+
+ENV GO111MODULE=off
 ENV CGO_ENABLED=0
 
 ARG GIT_COMMIT_SHA
 ARG GIT_COMMIT_MESSAGE
 ARG VERSION='dev'
 ARG ARCH="x86_64"
-ARG CGO_ENABLED=0
 ARG GOOS=linux
 ARG GOARM
 
diff --git a/gateway/Dockerfile.arm64 b/gateway/Dockerfile.arm64
index 3a6a6d9c..d32b4911 100644
--- a/gateway/Dockerfile.arm64
+++ b/gateway/Dockerfile.arm64
@@ -1,4 +1,8 @@
-FROM golang:1.10.4 as build
+FROM golang:1.12 as build
+
+ENV GO111MODULE=off
+ENV CGO_ENABLED=0
+
 ARG GIT_COMMIT_SHA
 ARG GIT_COMMIT_MESSAGE
 ARG VERSION='dev'
diff --git a/gateway/Dockerfile.armhf b/gateway/Dockerfile.armhf
index 6bb32557..35888c09 100644
--- a/gateway/Dockerfile.armhf
+++ b/gateway/Dockerfile.armhf
@@ -1,4 +1,8 @@
-FROM golang:1.10.4 as build
+FROM golang:1.12 as build
+
+ENV GO111MODULE=off
+ENV CGO_ENABLED=0
+
 ARG GIT_COMMIT_SHA
 ARG GIT_COMMIT_MESSAGE
 ARG VERSION='dev'
diff --git a/watchdog/Dockerfile b/watchdog/Dockerfile
index d0c7c540..a464945c 100644
--- a/watchdog/Dockerfile
+++ b/watchdog/Dockerfile
@@ -1,4 +1,6 @@
-FROM golang:1.11 as build
+FROM golang:1.12 as build
+
+ENV GO111MODULE=off
 ENV CGO_ENABLED=0
 
 ARG VERSION