diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index ad50c160..04b05d90 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -37,20 +37,14 @@ RUN curl --fail --silent -L https://github.com/just-containers/s6-overlay/releas
     tar xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin && \
     rm  /tmp/s6-overlay-amd64.tar.gz
 
-# Adding first run script and entrypoint
-COPY config/data_dirs.env config/init.bash /
-
-# Sync calls are due to https://github.com/docker/docker/issues/9547
-RUN chmod 755 /init.bash && \
-   sync && /init.bash && \
-   sync && rm /init.bash
-
 COPY config/filebeat.yml /etc/filebeat/
 
 RUN chmod go-w /etc/filebeat/filebeat.yml
 
 COPY config/etc/ /etc/
 
+COPY config/data_dirs.env /
+
 # Setting volumes
 VOLUME ["/var/ossec/data"]
 VOLUME ["/etc/filebeat"]
diff --git a/wazuh/config/etc/cont-init.d/0-wazuh-init b/wazuh/config/etc/cont-init.d/0-wazuh-init
index ae1b4a89..10796414 100644
--- a/wazuh/config/etc/cont-init.d/0-wazuh-init
+++ b/wazuh/config/etc/cont-init.d/0-wazuh-init
@@ -5,7 +5,6 @@
 # variables expected by this script.
 
 # Startup the services
-source /data_dirs.env
 
 FIRST_TIME_INSTALLATION=true
 
@@ -36,16 +35,6 @@ edit_configuration() { # $1 -> setting,  $2 -> value
     sed -i "s/^config.$1\s=.*/config.$1 = \"$2\";/g" "${DATA_PATH}/api/configuration/config.js" || error_and_exit "sed (editing configuration)"
 }
 
-for ossecdir in "${DATA_DIRS[@]}"; do
-  if [ ! -e "${DATA_PATH}/${ossecdir}" ]
-  then
-    print "Installing ${ossecdir}"
-    exec_cmd "mkdir -p $(dirname ${DATA_PATH}/${ossecdir})"
-    exec_cmd "cp -pr /var/ossec/${ossecdir}-template ${DATA_PATH}/${ossecdir}"
-    FIRST_TIME_INSTALLATION=true
-  fi
-done
-
 if [  -e ${WAZUH_INSTALL_PATH}/etc-template  ]
 then
     cp -p /var/ossec/etc-template/internal_options.conf /var/ossec/etc/internal_options.conf