diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
index a18bbe82..e9f22a0b 100644
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -10,7 +10,7 @@ ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
 ARG WAZUH_FILEBEAT_MODULE
 
-RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y
+RUN apt-get update && apt install curl apt-transport-https lsb-release xz-utils gnupg -y
 
 COPY config/check_repository.sh /
 RUN chmod 775 /check_repository.sh
diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
index f0cf6ec3..0bd90fd6 100644
--- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
+++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
@@ -115,7 +115,8 @@ function_entrypoint_scripts() {
 function_configure_vulnerability_detection() {
 if [ "$INDEXER_PASSWORD" != "" ]; then
   >&2 echo "Configuring password."
-  sed -i "s|<password>VDPass</password>|<password>$INDEXER_PASSWORD</password>|g" /var/ossec/etc/ossec.conf
+  /var/ossec/bin/wazuh-keystore -f indexer -k username -v $INDEXER_USERNAME
+  /var/ossec/bin/wazuh-keystore -f indexer -k password -v $INDEXER_PASSWORD
 fi
 }
 
diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf
index 1ec10630..92e5662f 100644
--- a/multi-node/config/wazuh_cluster/wazuh_manager.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf
@@ -108,8 +108,6 @@
       <host>https://wazuh2.indexer:9200</host>
       <host>https://wazuh3.indexer:9200</host>
     </hosts>
-    <username>admin</username>
-    <password>VDPass</password>
     <ssl>
       <certificate_authorities>
         <ca>/etc/ssl/root-ca.pem</ca>
diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf
index 9d277622..b49aa071 100644
--- a/multi-node/config/wazuh_cluster/wazuh_worker.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf
@@ -108,8 +108,6 @@
       <host>https://wazuh2.indexer:9200</host>
       <host>https://wazuh3.indexer:9200</host>
     </hosts>
-    <username>admin</username>
-    <password>VDPass</password>
     <ssl>
       <certificate_authorities>
         <ca>/etc/ssl/root-ca.pem</ca>
diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf
index 9dd0990c..64da4d81 100644
--- a/single-node/config/wazuh_cluster/wazuh_manager.conf
+++ b/single-node/config/wazuh_cluster/wazuh_manager.conf
@@ -106,8 +106,6 @@
     <hosts>
       <host>https://wazuh.indexer:9200</host>
     </hosts>
-    <username>admin</username>
-    <password>VDPass</password>
     <ssl>
       <certificate_authorities>
         <ca>/etc/ssl/root-ca.pem</ca>