diff --git a/README.md b/README.md
index 4fa618f4..f0c775c6 100644
--- a/README.md
+++ b/README.md
@@ -56,16 +56,16 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb
     │
     │ ├── playbooks
     │ │ ├── wazuh-agent.yml
+    │ │ ├── wazuh-dashboard.yml
     │ │ ├── wazuh-elastic.yml
     │ │ ├── wazuh-elastic_stack-distributed.yml
     │ │ ├── wazuh-elastic_stack-single.yml
+    │ │ ├── wazuh-indexer.yml
     │ │ ├── wazuh-kibana.yml
     │ │ ├── wazuh-manager-oss.yml
     │ │ ├── wazuh-manager.yml
-    │ │ ├── wazuh-opensearch-opensearch_dashboards.yml
-    | | ├── wazuh-opensearch-production-ready
-    │ │ ├── wazuh-opensearch-single.yml
-    │ │ ├── wazuh-opensearch.yml
+    | | ├── wazuh-production-ready
+    │ │ ├── wazuh-single.yml
     │
     │ ├── README.md
     │ ├── VERSION
@@ -321,7 +321,7 @@ ansible_ssh_extra_args='-o StrictHostKeyChecking=no'
 ### Launching the playbook
 
 ```bash
-sudo ansible-playbook wazuh-opensearch-production-ready.yml -i inventory
+sudo ansible-playbook wazuh-production-ready.yml -i inventory
 ```
 
 After the playbook execution, the Wazuh UI should be reachable through `https://<dashboard_host>:5601`
@@ -389,7 +389,7 @@ ansible_ssh_extra_args='-o StrictHostKeyChecking=no'
 ### Launching the playbook
 
 ```bash
-sudo ansible-playbook wazuh-opensearch-single.yml -i inventory
+sudo ansible-playbook wazuh-single.yml -i inventory
 ```
 
 After the playbook execution, the Wazuh UI should be reachable through `https://<your server host>:5601`
diff --git a/roles/wazuh/wazuh-dashboard/templates/opensearch_dashboards.yml.j2 b/roles/wazuh/wazuh-dashboard/templates/opensearch_dashboards.yml.j2
index a28aa9d3..f7910fb4 100644
--- a/roles/wazuh/wazuh-dashboard/templates/opensearch_dashboards.yml.j2
+++ b/roles/wazuh/wazuh-dashboard/templates/opensearch_dashboards.yml.j2
@@ -12,5 +12,4 @@ server.ssl.enabled: true
 server.ssl.key: "/etc/wazuh-dashboard/certs/{{ dashboard_node_name }}-key.pem"
 server.ssl.certificate: "/etc/wazuh-dashboard/certs/{{ dashboard_node_name }}.pem"
 opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"]
-logging.dest: "/var/log/wazuh-dashboard/wazuh-dashboard.log"
 uiSettings.overrides.defaultRoute: /app/wazuh?security_tenant=global
diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml
index 64f227ca..a2577773 100644
--- a/roles/wazuh/wazuh-indexer/defaults/main.yml
+++ b/roles/wazuh/wazuh-indexer/defaults/main.yml
@@ -56,7 +56,7 @@ indexer_http_port: 9200
 certs_gen_tool_version: 4.3
 
 # Url of certificates generator tool
-certs_gen_tool_url: "https://packages.wazuh.com/resources/{{ certs_gen_tool_version }}/install_functions/opendistro/wazuh-cert-tool.sh"
+certs_gen_tool_url: "https://packages.wazuh.com/resources/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
 
 indexer_admin_password: changeme
 dashboard_password: changeme
diff --git a/roles/wazuh/wazuh-indexer/templates/config.yml.j2 b/roles/wazuh/wazuh-indexer/templates/config.yml.j2
index 8b1babf1..c0382f9c 100644
--- a/roles/wazuh/wazuh-indexer/templates/config.yml.j2
+++ b/roles/wazuh/wazuh-indexer/templates/config.yml.j2
@@ -1,6 +1,6 @@
 nodes:
-  # Elasticsearch server nodes
-  elasticsearch:
+  # Indexer server nodes
+  indexer:
 {% for (key,value) in instances.items() %}
 {% if (value.role is defined and value.role == 'indexer') %}
     name: {{ value.name }}
@@ -10,7 +10,7 @@ nodes:
 
   # Wazuh server nodes
   # Use node_type only with more than one Wazuh manager
-  wazuh_servers:
+  server:
 {% for (key,value) in instances.items() %}
 {% if (value.role is defined and value.role == 'wazuh') %}
     name: {{ value.name }}
@@ -23,8 +23,8 @@ nodes:
 {% endif %}
 {% endfor %}
 
-  # Kibana node
-  kibana:
+  # Dashboard node
+  dashboard:
 {% for (key,value) in instances.items() %}
 {% if (value.role is defined and value.role == 'dashboard') %}
     name: {{ value.name }}
diff --git a/roles/wazuh/wazuh-indexer/templates/opensearch.yml.j2 b/roles/wazuh/wazuh-indexer/templates/opensearch.yml.j2
index 654c979d..e267084a 100644
--- a/roles/wazuh/wazuh-indexer/templates/opensearch.yml.j2
+++ b/roles/wazuh/wazuh-indexer/templates/opensearch.yml.j2
@@ -42,12 +42,12 @@ plugins.security.ssl.transport.resolve_hostname: false
 
 plugins.security.audit.type: internal_opensearch
 plugins.security.authcz.admin_dn:
-- "CN=admin,OU=Docu,O=Wazuh,L=California,C=US"
+- "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
 plugins.security.check_snapshot_restore_write_privileges: true
 plugins.security.enable_snapshot_restore_privilege: true
 plugins.security.nodes_dn:
 {% for (key,value) in instances.items() %}
-- "CN={{ value.name }},OU=Docu,O=Wazuh,L=California,C=US"
+- "CN={{ value.name }},OU=Wazuh,O=Wazuh,L=California,C=US"
 {% endfor %}
 plugins.security.restapi.roles_enabled:
 - "all_access"