diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94bb43b8..5bae149f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Create certificate directory with default user and group ([#2287](https://github.com/wazuh/wazuh-docker/pull/2287))
 - Standarize Artifact URL keys ([#2286](https://github.com/wazuh/wazuh-docker/pull/2286))
 - Certificates configuration script. ([#2285](https://github.com/wazuh/wazuh-docker/pull/2285))
 - Modify artifact URLs file name. ([#2266](https://github.com/wazuh/wazuh-docker/pull/2266))
diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
index 2584b972..507049ea 100644
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -41,6 +41,9 @@ COPY config/permanent_data.env config/permanent_data.sh /
 RUN mkdir -p /var/wazuh-manager/var/multigroups && \
     chown root:wazuh-manager /var/wazuh-manager/var/multigroups && \
     chmod 770 /var/wazuh-manager/var/multigroups && \
+    mkdir -p /var/wazuh-manager/etc/certs && \
+    chown wazuh-manager:wazuh-manager /var/wazuh-manager/etc/certs && \
+    chmod 500 /var/wazuh-manager/etc/certs && \
     chmod 755 /permanent_data.sh && \
     sync && /permanent_data.sh && \
     sync && rm /permanent_data.sh