diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8ecdef6b8..990e20102 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -84,6 +84,7 @@ RUN rm -r \
 # Move everything we prepared over to our final docker image
 FROM scratch
 COPY --from=production-stage / /
+RUN addgroup -g 1000 -S romm && adduser -u 1000 -D -S -G romm romm
 
 # Expose ports and start
 EXPOSE 8080
diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 8221910ba..7a1233603 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -1,4 +1,4 @@
-user www-data;
+user romm;
 worker_processes auto;
 pid /tmp/nginx.pid;