diff --git a/indexer_certs_creator/config/entrypoint.sh b/indexer_certs_creator/config/entrypoint.sh
index 567bf267..6ab0ba05 100644
--- a/indexer_certs_creator/config/entrypoint.sh
+++ b/indexer_certs_creator/config/entrypoint.sh
@@ -34,8 +34,8 @@ chmod 700 /$CERT_TOOL
 # Creating Cluster certificates
 ##############################################################################
 
-/$CERT_TOOL
+/$CERT_TOOL -A
 echo "Moving created certificates to destination directory"
-cp /certs/* /certificates/
+cp /wazuh-certificates/* /certificates/
 echo "changing certificate permissions"
 chmod -R 666 /certificates/*
diff --git a/wazuh-indexer/config/config.sh b/wazuh-indexer/config/config.sh
index 721c7209..ab62b030 100644
--- a/wazuh-indexer/config/config.sh
+++ b/wazuh-indexer/config/config.sh
@@ -66,7 +66,7 @@ else
   exit 1
 fi
 
-chmod 755 $CERT_TOOL && bash /$CERT_TOOL
+chmod 755 $CERT_TOOL && bash /$CERT_TOOL -A
 
 # copy to target
 mkdir -p ${TARGET_DIR}${INSTALLATION_DIR}
@@ -98,6 +98,6 @@ cp -pr /roles.yml ${TARGET_DIR}${INSTALLATION_DIR}/plugins/opensearch-security/s
 cp -pr /internal_users.yml ${TARGET_DIR}${INSTALLATION_DIR}/plugins/opensearch-security/securityconfig/
 cp -pr /opensearch.yml ${TARGET_DIR}${CONFIG_DIR}
 # Copy Wazuh indexer's demo certificates
-cp -pr /certs/* ${TARGET_DIR}${CONFIG_DIR}
+cp -pr /wazuh-certificates/* ${TARGET_DIR}${CONFIG_DIR}