diff --git a/appveyor.yml b/appveyor.yml
index d42d7b6614..7d13112f75 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
 
 environment:
   GOPATH: c:\gopath
-  GOVERSION: 1.12.17
+  GOVERSION: 1.13.8
   DEPVERSION: v0.4.1
 
 install:
diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native
index ea0aa3af51..e12456e0be 100644
--- a/dockerfiles/Dockerfile.binary-native
+++ b/dockerfiles/Dockerfile.binary-native
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.12.17
+ARG GO_VERSION=1.13.8
 
 FROM    golang:${GO_VERSION}-alpine
 
diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross
index ba5cd44636..6bcf0d8999 100644
--- a/dockerfiles/Dockerfile.cross
+++ b/dockerfiles/Dockerfile.cross
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.12.17
+ARG GO_VERSION=1.13.8
 
 FROM	dockercore/golang-cross:${GO_VERSION}
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
index 3db1cf389c..fee9ed1e99 100644
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.12.17
+ARG GO_VERSION=1.13.8
 
 FROM    golang:${GO_VERSION}-alpine
 
diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e
index 6eb0ebd61a..8bda7e5f32 100644
--- a/dockerfiles/Dockerfile.e2e
+++ b/dockerfiles/Dockerfile.e2e
@@ -1,7 +1,7 @@
-ARG GO_VERSION=1.12.17
+ARG GO_VERSION=1.13.8
 
 # Use Debian based image as docker-compose requires glibc.
-FROM golang:${GO_VERSION}
+FROM golang:${GO_VERSION}-buster
 
 RUN apt-get update && apt-get install -y \
     build-essential \
diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint
index 8d3ef7a1e7..ac2acdfa0b 100644
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.1.3-experimental
 
-ARG GO_VERSION=1.12.17
+ARG GO_VERSION=1.13.8
 ARG GOLANGCI_LINTER_SHA="v1.21.0"
 
 FROM    golang:${GO_VERSION}-alpine AS build