diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile
index 25da31313e..146f3d901b 100644
--- a/components/engine/Dockerfile
+++ b/components/engine/Dockerfile
@@ -189,8 +189,9 @@ RUN ln -s /usr/local/completion/bash/docker /etc/bash_completion.d/docker
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
 ENTRYPOINT ["hack/dind"]
 
+# Options for hack/validate/gometalinter
+ENV GOMETALINTER_OPTS="--deadline 2m"
+
 # Upload docker source
 COPY . /go/src/github.com/docker/docker
 
-# Options for hack/validate/gometalinter
-ENV GOMETALINTER_OPTS="--deadline 2m"
diff --git a/components/engine/Dockerfile.aarch64 b/components/engine/Dockerfile.aarch64
index 97dff4654f..e6a12fe370 100644
--- a/components/engine/Dockerfile.aarch64
+++ b/components/engine/Dockerfile.aarch64
@@ -158,8 +158,8 @@ ENV PATH=/usr/local/cli:$PATH
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
 ENTRYPOINT ["hack/dind"]
 
-# Upload docker source
-COPY . /go/src/github.com/docker/docker
-
 # Options for hack/validate/gometalinter
 ENV GOMETALINTER_OPTS="--deadline 4m -j2"
+
+# Upload docker source
+COPY . /go/src/github.com/docker/docker
diff --git a/components/engine/Dockerfile.armhf b/components/engine/Dockerfile.armhf
index 30ddf8c040..d67bdd0658 100644
--- a/components/engine/Dockerfile.armhf
+++ b/components/engine/Dockerfile.armhf
@@ -146,8 +146,8 @@ ENV PATH=/usr/local/cli:$PATH
 
 ENTRYPOINT ["hack/dind"]
 
-# Upload docker source
-COPY . /go/src/github.com/docker/docker
-
 # Options for hack/validate/gometalinter
 ENV GOMETALINTER_OPTS="--deadline 10m -j2"
+
+# Upload docker source
+COPY . /go/src/github.com/docker/docker