diff --git a/1.21/Dockerfile b/1.21/Dockerfile
index c33a2b6..f397fad 100644
--- a/1.21/Dockerfile
+++ b/1.21/Dockerfile
@@ -136,6 +136,8 @@ RUN sed -i 's,listen       80;,listen       8080;,' /etc/nginx/conf.d/default.co
     && chown -R $UID:0 /etc/nginx \
     && chmod -R g+w /etc/nginx
 
+USER $UID
+
 COPY 1.21/docker-entrypoint.sh /
 COPY 1.21/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
 COPY 1.21/20-envsubst-on-templates.sh /docker-entrypoint.d
@@ -146,6 +148,4 @@ EXPOSE 8080
 
 STOPSIGNAL SIGQUIT
 
-USER $UID
-
 CMD ["nginx", "-g", "daemon off;"]