diff --git a/distribution/docker/Dockerfile b/distribution/docker/Dockerfile
index 5eadba10959..f036cc07a43 100644
--- a/distribution/docker/Dockerfile
+++ b/distribution/docker/Dockerfile
@@ -45,15 +45,15 @@ LABEL maintainer="Apache Druid Developers <dev@druid.apache.org>"
 COPY --from=busybox /bin/busybox /busybox/busybox
 RUN ["/busybox/busybox", "--install", "/bin"]
 
-COPY --from=builder /opt /opt
-COPY distribution/docker/druid.sh /druid.sh
-
 RUN addgroup -S -g 1000 druid \
  && adduser -S -u 1000 -D -H -h /opt/druid -s /bin/sh -g '' -G druid druid \
  && mkdir -p /opt/druid/var \
  && chown -R druid:druid /opt \
  && chmod 775 /opt/druid/var
 
+COPY --chown=druid:druid --from=builder /opt /opt
+COPY distribution/docker/druid.sh /druid.sh
+
 USER druid
 VOLUME /opt/druid/var
 WORKDIR /opt/druid
diff --git a/distribution/docker/Dockerfile.java11 b/distribution/docker/Dockerfile.java11
index 091fd577544..8a5eb98af2f 100644
--- a/distribution/docker/Dockerfile.java11
+++ b/distribution/docker/Dockerfile.java11
@@ -45,15 +45,15 @@ LABEL maintainer="Apache Druid Developers <dev@druid.apache.org>"
 COPY --from=busybox /bin/busybox /busybox/busybox
 RUN ["/busybox/busybox", "--install", "/bin"]
 
-COPY --from=builder /opt /opt
-COPY distribution/docker/druid.sh /druid.sh
-
 RUN addgroup -S -g 1000 druid \
  && adduser -S -u 1000 -D -H -h /opt/druid -s /bin/sh -g '' -G druid druid \
  && mkdir -p /opt/druid/var \
  && chown -R druid:druid /opt \
  && chmod 775 /opt/druid/var
 
+COPY --chown=druid:druid --from=builder /opt /opt
+COPY distribution/docker/druid.sh /druid.sh
+
 USER druid
 VOLUME /opt/druid/var
 WORKDIR /opt/druid