diff --git a/wazuh-dashboard/Dockerfile b/wazuh-dashboard/Dockerfile
index bd380cce..821d23d2 100644
--- a/wazuh-dashboard/Dockerfile
+++ b/wazuh-dashboard/Dockerfile
@@ -58,10 +58,12 @@ RUN chmod 700 /entrypoint.sh
 RUN chmod 700 /wazuh_app_config.sh
 
 COPY --from=builder --chown=1000:1000 /usr/share/wazuh-dashboard /usr/share/wazuh-dashboard
-COPY --from=builder --chown=1000:1000 /var/log/wazuh-dashboard /var/log/wazuh-dashboard
 COPY --from=builder --chown=1000:1000 /run/wazuh-dashboard /run/wazuh-dashboard
 COPY --from=builder --chown=1000:1000 /etc/wazuh-dashboard /etc/wazuh-dashboard
 
+WORKDIR /usr/share/wazuh-dashboard/
+USER wazuh-dashboard
+
 # Services ports
 EXPOSE 443
 
diff --git a/wazuh-indexer/Dockerfile b/wazuh-indexer/Dockerfile
index 5020be24..8ae49e70 100644
--- a/wazuh-indexer/Dockerfile
+++ b/wazuh-indexer/Dockerfile
@@ -62,6 +62,8 @@ RUN mkdir -p /var/lib/wazuh-indexer && chown 1000:1000 /var/lib/wazuh-indexer &&
     mkdir -p /run/wazuh-indexer && chown 1000:1000 /run/wazuh-indexer && \
     mkdir -p /var/log/wazuh-indexer && chown 1000:1000 /var/log/wazuh-indexer
 
+USER wazuh-indexer
+
 # Services ports
 EXPOSE 9200