diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
index 290f9fa8..2ec1285d 100644
--- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh
+++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
@@ -5,6 +5,11 @@ INSTALL_DIR=/usr/share/wazuh-dashboard
 DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"
 DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
 
+set_correct_permOwner() {
+  find / -group 1000 -exec chown :999 {} +;
+  find / -user 1000 -exec chown 999 {} +;
+}
+
 # Create and configure Wazuh dashboard keystore
 
 yes | $INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \
@@ -15,6 +20,8 @@ echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add o
 # Start Wazuh dashboard
 ##############################################################################
 
+set_correct_permOwner
+
 /wazuh_app_config.sh $WAZUH_UI_REVISION
 
 /usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
\ No newline at end of file
diff --git a/build-docker-images/wazuh-indexer/config/entrypoint.sh b/build-docker-images/wazuh-indexer/config/entrypoint.sh
index ba244d4d..48a9bef3 100644
--- a/build-docker-images/wazuh-indexer/config/entrypoint.sh
+++ b/build-docker-images/wazuh-indexer/config/entrypoint.sh
@@ -24,6 +24,11 @@ run_as_other_user_if_needed() {
   fi
 }
 
+set_correct_permOwner() {
+  find / -group 1000 -exec chown :999 {} +;
+  find / -user 1000 -exec chown 999 {} +;
+}
+
 # Allow user specify custom CMD, maybe bin/opensearch itself
 # for example to directly specify `-E` style parameters for opensearch on k8s
 # or simply to run /bin/bash to check the image
@@ -90,4 +95,6 @@ fi
 #  touch "/var/lib/wazuh-indexer/.flag"
 #fi
 
+set_correct_permOwner
+
 run_as_other_user_if_needed /usr/share/wazuh-indexer/bin/opensearch <<<"$KEYSTORE_PASSWORD"
\ No newline at end of file