diff --git a/Dockerfile b/Dockerfile
index 75ebe709c..37076c6cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.13 AS builder
+ARG GOVERSION=latest
+FROM golang:$GOVERSION AS builder
 
 WORKDIR /src
 COPY . .
diff --git a/Dockerfile.builder b/Dockerfile.builder
index 0319e52f7..edb6323d8 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -1,4 +1,5 @@
-FROM golang:1.13
+ARG GOVERSION=latest
+FROM golang:$GOVERSION
 
 # FPM to build Debian packages
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/Dockerfile.stdiscosrv b/Dockerfile.stdiscosrv
index 918a71612..2373b7cd9 100644
--- a/Dockerfile.stdiscosrv
+++ b/Dockerfile.stdiscosrv
@@ -1,4 +1,5 @@
-FROM golang:1.13 AS builder
+ARG GOVERSION=latest
+FROM golang:$GOVERSION AS builder
 
 WORKDIR /src
 COPY . .
diff --git a/Dockerfile.strelaysrv b/Dockerfile.strelaysrv
index 8d15984ab..26bbf0098 100644
--- a/Dockerfile.strelaysrv
+++ b/Dockerfile.strelaysrv
@@ -1,4 +1,5 @@
-FROM golang:1.13 AS builder
+ARG GOVERSION=latest
+FROM golang:$GOVERSION AS builder
 
 WORKDIR /src
 COPY . .