diff --git a/Dockerfile b/Dockerfile
index 1bf9d57..d16b638 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,6 +50,12 @@ do \
     keytool -import -file $file -alias $file -cacerts -storepass changeit -noprompt; \
 done
 
+RUN chmod 755 /opt/app && \
+    chmod 644 /opt/app/status-board-assembly.jar && \
+    chmod 755 /opt/app/entrypoint.sh
+
+USER 10001:10001
+
 EXPOSE $PORT
 WORKDIR /opt/app
 ENTRYPOINT ["./entrypoint.sh"]
diff --git a/UI.Dockerfile b/UI.Dockerfile
index 6e9aaf4..144657d 100644
--- a/UI.Dockerfile
+++ b/UI.Dockerfile
@@ -9,7 +9,6 @@
 
 ARG BASE_IMAGE=nginx
 
-
 FROM $BASE_IMAGE
 LABEL org.opencontainers.image.authors="ABSA"
 
@@ -17,6 +16,10 @@ LABEL org.opencontainers.image.authors="ABSA"
 COPY ./ui/dist/ui/browser/ /usr/share/nginx/html
 COPY ./ui/conf/nginx.conf /etc/nginx/conf.d/default.conf
 
+RUN chmod -R 777 /var/cache/nginx /var/run
+
+USER nginx
+
 EXPOSE 4200
 
 CMD ["nginx", "-g", "daemon off;"]