diff --git a/ldap.Dockerfile b/ldap.Dockerfile
index 61f88dc93..04b9b056c 100644
--- a/ldap.Dockerfile
+++ b/ldap.Dockerfile
@@ -15,8 +15,6 @@ RUN	docker-entrypoint.sh generate \
 
 # Stage 2: Build
 FROM golang:1.16.6 AS builder
-ARG GIT_BUILD_HASH
-ENV GIT_BUILD_HASH=$GIT_BUILD_HASH
 
 WORKDIR /go/src/goauthentik.io
 
@@ -28,6 +26,9 @@ RUN go build -o /go/ldap ./cmd/ldap
 # Stage 3: Run
 FROM gcr.io/distroless/base-debian10:debug
 
+ARG GIT_BUILD_HASH
+ENV GIT_BUILD_HASH=$GIT_BUILD_HASH
+
 COPY --from=builder /go/ldap /
 
 HEALTHCHECK CMD [ "wget", "--spider", "http://localhost:4180/akprox/ping" ]
diff --git a/proxy.Dockerfile b/proxy.Dockerfile
index 7df06afab..838488a4c 100644
--- a/proxy.Dockerfile
+++ b/proxy.Dockerfile
@@ -15,8 +15,6 @@ RUN	docker-entrypoint.sh generate \
 
 # Stage 2: Build
 FROM golang:1.16.6 AS builder
-ARG GIT_BUILD_HASH
-ENV GIT_BUILD_HASH=$GIT_BUILD_HASH
 
 WORKDIR /go/src/goauthentik.io
 
@@ -28,6 +26,9 @@ RUN go build -o /go/proxy ./cmd/proxy
 # Stage 3: Run
 FROM gcr.io/distroless/base-debian10:debug
 
+ARG GIT_BUILD_HASH
+ENV GIT_BUILD_HASH=$GIT_BUILD_HASH
+
 COPY --from=builder /go/proxy /
 
 HEALTHCHECK CMD [ "wget", "--spider", "http://localhost:4180/akprox/ping" ]