diff --git a/Dockerfile b/Dockerfile
index bf89917..d48e011 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,8 +54,12 @@ RUN \
   gem update --system && \
   bundle config set app_config ${GEM_HOME}
 
+USER ${NAME}
+
 FROM development AS builder
 
+USER root
+
 COPY Gemfile Gemfile.lock package.json yarn.lock ./
 
 RUN bundle install && yarn install
@@ -120,7 +124,7 @@ COPY --from=builder /app/.bundle /app/.bundle
 COPY --from=assets /app/public/assets /app/public/assets
 
 RUN chown -R app:app /app/tmp /app/log /app/storage
-RUN date -u +"%Y-%m-%d %H:%M:%s" >> .build_version
+RUN date +"%Y-%m-%d %H:%M:%S %Z" >> .build_version
 
 USER app
 # Using variables in command list is not possible: