diff --git a/clients/cmd/promtail/Dockerfile b/clients/cmd/promtail/Dockerfile
index b7a1cc8659a89..2b3b0f18b5944 100644
--- a/clients/cmd/promtail/Dockerfile
+++ b/clients/cmd/promtail/Dockerfile
@@ -1,7 +1,7 @@
 ARG GO_VERSION=1.23
-ARG IMAGE_TAG
 
 FROM golang:${GO_VERSION}-bookworm as build
+ARG IMAGE_TAG
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/cmd/loki-canary-boringcrypto/Dockerfile b/cmd/loki-canary-boringcrypto/Dockerfile
index de0e814d5df07..a3435ac86ddf1 100644
--- a/cmd/loki-canary-boringcrypto/Dockerfile
+++ b/cmd/loki-canary-boringcrypto/Dockerfile
@@ -1,6 +1,6 @@
 ARG GO_VERSION=1.23
-ARG IMAGE_TAG
 FROM golang:${GO_VERSION} as build
+ARG IMAGE_TAG
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/cmd/loki-canary/Dockerfile b/cmd/loki-canary/Dockerfile
index f3532c804e46f..46a8a9bc5f53e 100644
--- a/cmd/loki-canary/Dockerfile
+++ b/cmd/loki-canary/Dockerfile
@@ -1,6 +1,6 @@
 ARG GO_VERSION=1.23
-ARG IMAGE_TAG
 FROM golang:${GO_VERSION} AS build
+ARG IMAGE_TAG
 
 COPY . /src/loki
 WORKDIR /src/loki
diff --git a/cmd/loki/Dockerfile b/cmd/loki/Dockerfile
index 13e2f80dfffb6..3718e4a3c2005 100644
--- a/cmd/loki/Dockerfile
+++ b/cmd/loki/Dockerfile
@@ -1,5 +1,4 @@
 ARG GO_VERSION=1.23
-ARG IMAGE_TAG
 
 # UI build stage
 FROM node:20-alpine AS ui-builder
@@ -10,6 +9,7 @@ RUN make -C pkg/dataobj/explorer/ui build
 
 # Go build stage
 FROM golang:${GO_VERSION} AS build
+ARG IMAGE_TAG
 COPY . /src/loki
 COPY --from=ui-builder /src/loki/pkg/dataobj/explorer/dist /src/loki/pkg/dataobj/explorer/dist
 WORKDIR /src/loki
diff --git a/cmd/querytee/Dockerfile b/cmd/querytee/Dockerfile
index 9fc23f8ce316b..166bcaf49c00d 100644
--- a/cmd/querytee/Dockerfile
+++ b/cmd/querytee/Dockerfile
@@ -1,9 +1,10 @@
 ARG GO_VERSION=1.23
 FROM golang:${GO_VERSION} as build
+ARG IMAGE_TAG
 
 COPY . /src/loki
 WORKDIR /src/loki
-RUN make clean && make BUILD_IN_CONTAINER=false loki-querytee
+RUN make clean && make BUILD_IN_CONTAINER=false IMAGE_TAG=${IMAGE_TAG} loki-querytee
 
 FROM gcr.io/distroless/static:debug
 COPY --from=build /src/loki/cmd/querytee/querytee /usr/bin/querytee