diff --git a/Dockerfile b/Dockerfile
index c36dfdc..e586779 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,16 +30,15 @@ WORKDIR /app
 
 ENV NODE_ENV=production
 
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
 COPY --from=builder /app/public ./public
 
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
-RUN mkdir -p data && chown nextjs:nodejs data
-RUN mkdir -p data/images && chown nextjs:nodejs data/images
+RUN addgroup --system --gid 1001 nodejs \
+  && adduser --system --uid 1001 --ingroup nodejs nextjs \
+  && mkdir -p /app/data/images \
+  && chown -R nextjs:nodejs /app/data
 
 USER nextjs