diff --git a/Dockerfile b/Dockerfile
index ba8b3224..bf5fbb95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 FROM golang:1.16-buster AS builder
-ARG VERSION
 
 # Copy sources
 WORKDIR $GOPATH/src/github.com/oauth2-proxy/oauth2-proxy
@@ -11,6 +10,8 @@ RUN GO111MODULE=on go mod download
 # Now pull in our code
 COPY . .
 
+ARG VERSION
+
 # Build binary and make sure there is at least an empty key file.
 #  This is useful for GCP App Engine custom runtime builds, because
 #  you cannot use multiline variables in their app.yaml, so you have to
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 3c60b107..d4c00d5d 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,5 +1,4 @@
 FROM golang:1.16-buster AS builder
-ARG VERSION
 
 # Copy sources
 WORKDIR $GOPATH/src/github.com/oauth2-proxy/oauth2-proxy
@@ -11,6 +10,8 @@ RUN GO111MODULE=on go mod download
 # Now pull in our code
 COPY . .
 
+ARG VERSION
+
 # Build binary and make sure there is at least an empty key file.
 #  This is useful for GCP App Engine custom runtime builds, because
 #  you cannot use multiline variables in their app.yaml, so you have to
diff --git a/Dockerfile.armv6 b/Dockerfile.armv6
index 435394e1..f413b155 100644
--- a/Dockerfile.armv6
+++ b/Dockerfile.armv6
@@ -1,5 +1,4 @@
 FROM golang:1.16-buster AS builder
-ARG VERSION
 
 # Copy sources
 WORKDIR $GOPATH/src/github.com/oauth2-proxy/oauth2-proxy
@@ -11,6 +10,8 @@ RUN GO111MODULE=on go mod download
 # Now pull in our code
 COPY . .
 
+ARG VERSION
+
 # Build binary and make sure there is at least an empty key file.
 #  This is useful for GCP App Engine custom runtime builds, because
 #  you cannot use multiline variables in their app.yaml, so you have to