diff --git a/docker-compose.yml b/docker-compose.yml
index 5ce264b9..861ffd17 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,9 +2,9 @@
 version: '3.7'
 
 services:
-  wazuh:
+  wazuh.manager:
     image: wazuh/wazuh-odfe:4.3.0
-    hostname: wazuh-manager
+    hostname: wazuh.manager
     restart: always
     ports:
       - "1514:1514"
diff --git a/production-cluster.yml b/production-cluster.yml
index ae431ba2..c2f7f3bb 100644
--- a/production-cluster.yml
+++ b/production-cluster.yml
@@ -2,16 +2,16 @@
 version: '3.7'
 
 services:
-  wazuh-master:
-    image: wazuh/wazuh-odfe:4.3.0
-    hostname: wazuh-master
+  wazuh.master:
+    image: wazuh/wazuh-odfe:4.3.0-dev
+    hostname: wazuh.master
     restart: always
     ports:
       - "1515:1515"
       - "514:514/udp"
       - "55000:55000"
     environment:
-      - ELASTICSEARCH_URL=https://wazuh-indexer:9700
+      - ELASTICSEARCH_URL=https://wazuh1.indexer:9700
       - ELASTIC_USERNAME=admin
       - ELASTIC_PASSWORD=SecretPassword
       - FILEBEAT_SSL_VERIFICATION_MODE=full
@@ -33,16 +33,16 @@ services:
       - filebeat-etc:/etc/filebeat
       - filebeat-var:/var/lib/filebeat
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/ssl/root-ca.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/filebeat.pem:/etc/ssl/filebeat.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/filebeat.key:/etc/ssl/filebeat.key
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.master.pem:/etc/ssl/filebeat.pem
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.master-key.pem:/etc/ssl/filebeat.key
       - ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
-  wazuh-worker:
-    image: wazuh/wazuh-odfe:4.3.0
-    hostname: wazuh-worker
+  wazuh.worker:
+    image: wazuh/wazuh-odfe:4.3.0-dev
+    hostname: wazuh.worker
     restart: always
     environment:
-      - ELASTICSEARCH_URL=https://wazuh-indexer:9700
+      - ELASTICSEARCH_URL=https://wazuh1.indexer:9700
       - ELASTIC_USERNAME=admin
       - ELASTIC_PASSWORD=SecretPassword
       - FILEBEAT_SSL_VERIFICATION_MODE=full
@@ -62,19 +62,18 @@ services:
       - worker-filebeat-etc:/etc/filebeat
       - worker-filebeat-var:/var/lib/filebeat
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/ssl/root-ca.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/filebeat.pem:/etc/ssl/filebeat.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/filebeat.key:/etc/ssl/filebeat.key
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.worker.pem:/etc/ssl/filebeat.pem
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.worker-key.pem:/etc/ssl/filebeat.key
       - ./production_cluster/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 
-  wazuh-indexer:
-    image: wazuh-indexer
-    hostname: wazuh-indexer
+  wazuh1.indexer:
+    image: wazuh/wazuh-indexer:4.3.0
+    hostname: wazuh1.indexer
     restart: always
     ports:
       - "9700:9700"
     environment:
       - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
-      - "NODE_TYPE=master"
       - "bootstrap.memory_lock=true"
     ulimits:
       memlock:
@@ -86,20 +85,19 @@ services:
     volumes:
       - wazuh-indexer-data-1:/var/lib/wazuh-indexer
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/wazuh-indexer/certs/root-ca.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer.key:/etc/wazuh-indexer/certs/wazuh-indexer.key
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer.pem:/etc/wazuh-indexer/certs/wazuh-indexer.pem
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh1.indexer-key.pem:/etc/wazuh-indexer/certs/wazuh1.indexer.key
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh1.indexer.pem:/etc/wazuh-indexer/certs/wazuh1.indexer.pem
       - ./production_cluster/wazuh_indexer_ssl_certs/admin.pem:/etc/wazuh-indexer/certs/admin.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/admin.key:/etc/wazuh-indexer/certs/admin-key.pem
-      - ./production_cluster/wazuh-indexer/opensearch-node1.yml:/etc/wazuh-indexer/opensearch.yml
+      - ./production_cluster/wazuh_indexer_ssl_certs/admin-key.pem:/etc/wazuh-indexer/certs/admin-key.pem
+      - ./production_cluster/wazuh-indexer/wazuh1.indexer.yml:/etc/wazuh-indexer/opensearch.yml
       - ./production_cluster/wazuh-indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
-  wazuh-indexer-2:
-    image: wazuh-indexer
-    hostname: wazuh-indexer-2
+  wazuh2.indexer:
+    image: wazuh/wazuh-indexer:4.3.0
+    hostname: wazuh2.indexer
     restart: always
     environment:
       - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
-      - "NODE_TYPE=worker"
       - "bootstrap.memory_lock=true"
     ulimits:
       memlock:
@@ -111,18 +109,17 @@ services:
     volumes:
       - wazuh-indexer-data-2:/var/lib/wazuh-indexer
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/wazuh-indexer/certs/root-ca.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer-2.key:/etc/wazuh-indexer/certs/wazuh-indexer-2.key
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer-2.pem:/etc/wazuh-indexer/certs/wazuh-indexer-2.pem
-      - ./production_cluster/wazuh-indexer/opensearch-node2.yml:/etc/wazuh-indexer/opensearch.yml
-      - ./production_cluster/wazuh-indexer/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh2.indexer-key.pem:/etc/wazuh-indexer/certs/wazuh2.indexer.key
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh2.indexer.pem:/etc/wazuh-indexer/certs/wazuh2.indexer.pem
+      - ./production_cluster/wazuh-indexer/wazuh2.indexer.yml:/etc/wazuh-indexer/opensearch.yml
+      - ./production_cluster/wazuh-indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
-  wazuh-indexer-3:
-    image: wazuh-indexer
-    hostname: wazuh-indexer-3
+  wazuh3.indexer:
+    image: wazuh/wazuh-indexer:4.3.0
+    hostname: wazuh3.indexer
     restart: always
     environment:
       - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
-      - "NODE_TYPE=worker"
       - "bootstrap.memory_lock=true"
     ulimits:
       memlock:
@@ -134,35 +131,33 @@ services:
     volumes:
       - wazuh-indexer-data-3:/var/lib/wazuh-indexer
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/wazuh-indexer/certs/root-ca.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer-3.key:/etc/wazuh-indexer/certs/wazuh-indexer-3.key
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer-3.pem:/etc/wazuh-indexer/certs/wazuh-indexer-3.pem
-      - ./production_cluster/wazuh-indexer/opensearch-node3.yml:/etc/wazuh-indexer/opensearch.yml
-      - ./production_cluster/wazuh-indexer/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh3.indexer-key.pem:/etc/wazuh-indexer/certs/wazuh3.indexer.key
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh3.indexer.pem:/etc/wazuh-indexer/certs/wazuh3.indexer.pem
+      - ./production_cluster/wazuh-indexer/wazuh3.indexer.yml:/etc/wazuh-indexer/opensearch.yml
+      - ./production_cluster/wazuh-indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
-  kibana:
+  wazuh.dashboard:
     image: wazuh/wazuh-dashboard:4.3.0
-    hostname: kibana
+    hostname: wazuh.dashboard
     restart: always
     ports:
       - 5601:5601
     environment:
-      - ELASTICSEARCH_USERNAME=admin
-      - ELASTICSEARCH_PASSWORD=SecretPassword
-      - SERVER_SSL_ENABLED=true
-      - SERVER_SSL_CERTIFICATE=/etc/wazuh-dashboard/certs/cert.pem
-      - SERVER_SSL_KEY=/etc/wazuh-dashboard/certs/key.pem
-      - WAZUH_API_URL="https://wazuh-master"
+      - OPENSEARCH_HOSTS="https://wazuh1.indexer:9700"
+      - WAZUH_API_URL="https://wazuh.master"
       - API_USERNAME=acme-user
       - API_PASSWORD=MyS3cr37P450r.*-
     volumes:
-      - ./production_cluster/kibana_ssl/cert.pem:/etc/wazuh-dashboard/certs/cert.pem
-      - ./production_cluster/kibana_ssl/key.pem:/etc/wazuh-dashboard/certs/key.pem
-
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/etc/wazuh-dashboard/certs/wazuh-dashboard.pem
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/etc/wazuh-dashboard/certs/wazuh-dashboard-key.pem
+      - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/wazuh-dashboard/certs/root-ca.pem
+      - ./production_cluster/wazuh_dashboard/dashboard.yml:/etc/wazuh-dashboard/dashboard.yml
+      - ./production_cluster/wazuh_dashboard/wazuh:/usr/share/wazuh-dashboard/data/wazuh
     depends_on:
-      - wazuh-indexer
+      - wazuh1.indexer
     links:
-      - wazuh-indexer:wazuh-indexer
-      - wazuh-master:wazuh-master
+      - wazuh1.indexer:wazuh1.indexer
+      - wazuh.master:wazuh.master
 
   nginx:
     image: nginx:stable
@@ -173,13 +168,13 @@ services:
       - "443:443"
       - "1514:1514"
     depends_on:
-      - wazuh-master
-      - wazuh-worker
-      - kibana
+      - wazuh.master
+      - wazuh.worker
+      - wazuh.dashboard
     links:
-      - wazuh-master:wazuh-master
-      - wazuh-worker:wazuh-worker
-      - kibana:kibana
+      - wazuh.master:wazuh.master
+      - wazuh.worker:wazuh.worker
+      - wazuh.dashboard:wazuh.dashboard
     volumes:
       - ./production_cluster/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - ./production_cluster/nginx/ssl:/etc/nginx/ssl:ro
diff --git a/test-cluster.yml b/production-cluster_odfe.yml
similarity index 61%
rename from test-cluster.yml
rename to production-cluster_odfe.yml
index c2f7f3bb..ae431ba2 100644
--- a/test-cluster.yml
+++ b/production-cluster_odfe.yml
@@ -2,16 +2,16 @@
 version: '3.7'
 
 services:
-  wazuh.master:
-    image: wazuh/wazuh-odfe:4.3.0-dev
-    hostname: wazuh.master
+  wazuh-master:
+    image: wazuh/wazuh-odfe:4.3.0
+    hostname: wazuh-master
     restart: always
     ports:
       - "1515:1515"
       - "514:514/udp"
       - "55000:55000"
     environment:
-      - ELASTICSEARCH_URL=https://wazuh1.indexer:9700
+      - ELASTICSEARCH_URL=https://wazuh-indexer:9700
       - ELASTIC_USERNAME=admin
       - ELASTIC_PASSWORD=SecretPassword
       - FILEBEAT_SSL_VERIFICATION_MODE=full
@@ -33,16 +33,16 @@ services:
       - filebeat-etc:/etc/filebeat
       - filebeat-var:/var/lib/filebeat
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/ssl/root-ca.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.master.pem:/etc/ssl/filebeat.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.master-key.pem:/etc/ssl/filebeat.key
+      - ./production_cluster/wazuh_indexer_ssl_certs/filebeat.pem:/etc/ssl/filebeat.pem
+      - ./production_cluster/wazuh_indexer_ssl_certs/filebeat.key:/etc/ssl/filebeat.key
       - ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
-  wazuh.worker:
-    image: wazuh/wazuh-odfe:4.3.0-dev
-    hostname: wazuh.worker
+  wazuh-worker:
+    image: wazuh/wazuh-odfe:4.3.0
+    hostname: wazuh-worker
     restart: always
     environment:
-      - ELASTICSEARCH_URL=https://wazuh1.indexer:9700
+      - ELASTICSEARCH_URL=https://wazuh-indexer:9700
       - ELASTIC_USERNAME=admin
       - ELASTIC_PASSWORD=SecretPassword
       - FILEBEAT_SSL_VERIFICATION_MODE=full
@@ -62,18 +62,19 @@ services:
       - worker-filebeat-etc:/etc/filebeat
       - worker-filebeat-var:/var/lib/filebeat
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/ssl/root-ca.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.worker.pem:/etc/ssl/filebeat.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.worker-key.pem:/etc/ssl/filebeat.key
+      - ./production_cluster/wazuh_indexer_ssl_certs/filebeat.pem:/etc/ssl/filebeat.pem
+      - ./production_cluster/wazuh_indexer_ssl_certs/filebeat.key:/etc/ssl/filebeat.key
       - ./production_cluster/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 
-  wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.3.0
-    hostname: wazuh1.indexer
+  wazuh-indexer:
+    image: wazuh-indexer
+    hostname: wazuh-indexer
     restart: always
     ports:
       - "9700:9700"
     environment:
       - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
+      - "NODE_TYPE=master"
       - "bootstrap.memory_lock=true"
     ulimits:
       memlock:
@@ -85,19 +86,20 @@ services:
     volumes:
       - wazuh-indexer-data-1:/var/lib/wazuh-indexer
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/wazuh-indexer/certs/root-ca.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh1.indexer-key.pem:/etc/wazuh-indexer/certs/wazuh1.indexer.key
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh1.indexer.pem:/etc/wazuh-indexer/certs/wazuh1.indexer.pem
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer.key:/etc/wazuh-indexer/certs/wazuh-indexer.key
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer.pem:/etc/wazuh-indexer/certs/wazuh-indexer.pem
       - ./production_cluster/wazuh_indexer_ssl_certs/admin.pem:/etc/wazuh-indexer/certs/admin.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/admin-key.pem:/etc/wazuh-indexer/certs/admin-key.pem
-      - ./production_cluster/wazuh-indexer/wazuh1.indexer.yml:/etc/wazuh-indexer/opensearch.yml
+      - ./production_cluster/wazuh_indexer_ssl_certs/admin.key:/etc/wazuh-indexer/certs/admin-key.pem
+      - ./production_cluster/wazuh-indexer/opensearch-node1.yml:/etc/wazuh-indexer/opensearch.yml
       - ./production_cluster/wazuh-indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
-  wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.3.0
-    hostname: wazuh2.indexer
+  wazuh-indexer-2:
+    image: wazuh-indexer
+    hostname: wazuh-indexer-2
     restart: always
     environment:
       - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
+      - "NODE_TYPE=worker"
       - "bootstrap.memory_lock=true"
     ulimits:
       memlock:
@@ -109,17 +111,18 @@ services:
     volumes:
       - wazuh-indexer-data-2:/var/lib/wazuh-indexer
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/wazuh-indexer/certs/root-ca.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh2.indexer-key.pem:/etc/wazuh-indexer/certs/wazuh2.indexer.key
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh2.indexer.pem:/etc/wazuh-indexer/certs/wazuh2.indexer.pem
-      - ./production_cluster/wazuh-indexer/wazuh2.indexer.yml:/etc/wazuh-indexer/opensearch.yml
-      - ./production_cluster/wazuh-indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer-2.key:/etc/wazuh-indexer/certs/wazuh-indexer-2.key
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer-2.pem:/etc/wazuh-indexer/certs/wazuh-indexer-2.pem
+      - ./production_cluster/wazuh-indexer/opensearch-node2.yml:/etc/wazuh-indexer/opensearch.yml
+      - ./production_cluster/wazuh-indexer/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
 
-  wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.3.0
-    hostname: wazuh3.indexer
+  wazuh-indexer-3:
+    image: wazuh-indexer
+    hostname: wazuh-indexer-3
     restart: always
     environment:
       - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
+      - "NODE_TYPE=worker"
       - "bootstrap.memory_lock=true"
     ulimits:
       memlock:
@@ -131,33 +134,35 @@ services:
     volumes:
       - wazuh-indexer-data-3:/var/lib/wazuh-indexer
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/wazuh-indexer/certs/root-ca.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh3.indexer-key.pem:/etc/wazuh-indexer/certs/wazuh3.indexer.key
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh3.indexer.pem:/etc/wazuh-indexer/certs/wazuh3.indexer.pem
-      - ./production_cluster/wazuh-indexer/wazuh3.indexer.yml:/etc/wazuh-indexer/opensearch.yml
-      - ./production_cluster/wazuh-indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer-3.key:/etc/wazuh-indexer/certs/wazuh-indexer-3.key
+      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh-indexer-3.pem:/etc/wazuh-indexer/certs/wazuh-indexer-3.pem
+      - ./production_cluster/wazuh-indexer/opensearch-node3.yml:/etc/wazuh-indexer/opensearch.yml
+      - ./production_cluster/wazuh-indexer/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
 
-  wazuh.dashboard:
+  kibana:
     image: wazuh/wazuh-dashboard:4.3.0
-    hostname: wazuh.dashboard
+    hostname: kibana
     restart: always
     ports:
       - 5601:5601
     environment:
-      - OPENSEARCH_HOSTS="https://wazuh1.indexer:9700"
-      - WAZUH_API_URL="https://wazuh.master"
+      - ELASTICSEARCH_USERNAME=admin
+      - ELASTICSEARCH_PASSWORD=SecretPassword
+      - SERVER_SSL_ENABLED=true
+      - SERVER_SSL_CERTIFICATE=/etc/wazuh-dashboard/certs/cert.pem
+      - SERVER_SSL_KEY=/etc/wazuh-dashboard/certs/key.pem
+      - WAZUH_API_URL="https://wazuh-master"
       - API_USERNAME=acme-user
       - API_PASSWORD=MyS3cr37P450r.*-
     volumes:
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/etc/wazuh-dashboard/certs/wazuh-dashboard.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/etc/wazuh-dashboard/certs/wazuh-dashboard-key.pem
-      - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/wazuh-dashboard/certs/root-ca.pem
-      - ./production_cluster/wazuh_dashboard/dashboard.yml:/etc/wazuh-dashboard/dashboard.yml
-      - ./production_cluster/wazuh_dashboard/wazuh:/usr/share/wazuh-dashboard/data/wazuh
+      - ./production_cluster/kibana_ssl/cert.pem:/etc/wazuh-dashboard/certs/cert.pem
+      - ./production_cluster/kibana_ssl/key.pem:/etc/wazuh-dashboard/certs/key.pem
+
     depends_on:
-      - wazuh1.indexer
+      - wazuh-indexer
     links:
-      - wazuh1.indexer:wazuh1.indexer
-      - wazuh.master:wazuh.master
+      - wazuh-indexer:wazuh-indexer
+      - wazuh-master:wazuh-master
 
   nginx:
     image: nginx:stable
@@ -168,13 +173,13 @@ services:
       - "443:443"
       - "1514:1514"
     depends_on:
-      - wazuh.master
-      - wazuh.worker
-      - wazuh.dashboard
+      - wazuh-master
+      - wazuh-worker
+      - kibana
     links:
-      - wazuh.master:wazuh.master
-      - wazuh.worker:wazuh.worker
-      - wazuh.dashboard:wazuh.dashboard
+      - wazuh-master:wazuh-master
+      - wazuh-worker:wazuh-worker
+      - kibana:kibana
     volumes:
       - ./production_cluster/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - ./production_cluster/nginx/ssl:/etc/nginx/ssl:ro
diff --git a/production_cluster/wazuh_dashboard/wazuh/config/wazuh-registry.json b/production_cluster/wazuh_dashboard/wazuh/config/wazuh-registry.json
deleted file mode 100644
index 5c393051..00000000
--- a/production_cluster/wazuh_dashboard/wazuh/config/wazuh-registry.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"Wazuh App","app-version":"4.3.0","revision":"4301-0","installationDate":"2022-02-10T13:49:45.182Z","lastRestart":"2022-02-10T13:49:45.182Z","hosts":{"default":{"cluster_info":{"status":"enabled","manager":"wazuh.master","node":"manager","cluster":"wazuh"},"extensions":{"pci":true,"gdpr":true,"hipaa":true,"nist":true,"tsc":true,"audit":true,"oscap":false,"ciscat":false,"aws":false,"office":false,"github":false,"gcp":false,"virustotal":false,"osquery":false,"docker":false}}}}
\ No newline at end of file
diff --git a/production_cluster/wazuh_dashboard/wazuh/logs/wazuhapp-plain.log b/production_cluster/wazuh_dashboard/wazuh/logs/wazuhapp-plain.log
deleted file mode 100644
index 67e659fb..00000000
--- a/production_cluster/wazuh_dashboard/wazuh/logs/wazuhapp-plain.log
+++ /dev/null
@@ -1,38 +0,0 @@
-info: 2022/02/10 13:49:44: initialize: Kibana index: .kibana
-info: 2022/02/10 13:49:44: initialize: App revision: 4301-0
-info: 2022/02/10 13:49:44: initialize: Total RAM: 11928MB
-error: 2022/02/10 13:49:45: initialize:checkKibanaStatus: Could not check if the index .wazuh exists due to no permissions for create, delete or check
-error: 2022/02/10 13:55:0: cron-scheduler|SaveDocument: resource_already_exists_exception
-info: 2022/02/10 18:35:47: initialize: Kibana index: .kibana
-info: 2022/02/10 18:35:47: initialize: App revision: 4301-0
-info: 2022/02/10 18:35:47: initialize: Total RAM: 11928MB
-error: 2022/02/10 18:35:47: initialize:checkKibanaStatus: Could not check if the index .wazuh exists due to no permissions for create, delete or check
-error: 2022/02/10 18:40:0: cron-scheduler|SaveDocument: resource_already_exists_exception
-info: 2022/02/10 18:42:13: initialize: Kibana index: .kibana
-info: 2022/02/10 18:42:13: initialize: App revision: 4301-0
-info: 2022/02/10 18:42:13: initialize: Total RAM: 11928MB
-error: 2022/02/10 18:42:14: initialize:checkKibanaStatus: Could not check if the index .wazuh exists due to no permissions for create, delete or check
-error: 2022/02/10 18:45:0: cron-scheduler|SaveDocument: resource_already_exists_exception
-info: 2022/02/10 20:23:3: initialize: Kibana index: .kibana
-info: 2022/02/10 20:23:3: initialize: App revision: 4301-0
-info: 2022/02/10 20:23:3: initialize: Total RAM: 11928MB
-error: 2022/02/10 20:23:4: initialize:checkKibanaStatus: Could not check if the index .wazuh exists due to no permissions for create, delete or check
-error: 2022/02/10 20:25:0: cron-scheduler|SaveDocument: resource_already_exists_exception
-info: 2022/02/11 18:48:39: initialize: Kibana index: .kibana
-info: 2022/02/11 18:48:39: initialize: App revision: 4301-0
-info: 2022/02/11 18:48:39: initialize: Total RAM: 11928MB
-error: 2022/02/11 18:48:40: initialize:checkKibanaStatus: Could not check if the index .wazuh exists due to no permissions for create, delete or check
-error: 2022/02/11 18:50:1: cron-scheduler|SaveDocument: resource_already_exists_exception
-info: 2022/02/11 19:23:22: initialize: Kibana index: .kibana
-info: 2022/02/11 19:23:22: initialize: App revision: 4301-0
-info: 2022/02/11 19:23:22: initialize: Total RAM: 11928MB
-error: 2022/02/11 19:23:23: initialize:checkKibanaStatus: Could not check if the index .wazuh exists due to no permissions for create, delete or check
-error: 2022/02/11 19:25:0: cron-scheduler|SaveDocument: resource_already_exists_exception
-info: 2022/02/11 19:27:28: initialize: Kibana index: .kibana
-info: 2022/02/11 19:27:28: initialize: App revision: 4301-0
-info: 2022/02/11 19:27:28: initialize: Total RAM: 11928MB
-error: 2022/02/11 19:27:28: initialize:checkKibanaStatus: Could not check if the index .wazuh exists due to no permissions for create, delete or check
-info: 2022/02/11 19:31:58: initialize: Kibana index: .kibana
-info: 2022/02/11 19:31:58: initialize: App revision: 4301-0
-info: 2022/02/11 19:31:58: initialize: Total RAM: 11928MB
-error: 2022/02/11 19:31:59: initialize:checkKibanaStatus: Could not check if the index .wazuh exists due to no permissions for create, delete or check
diff --git a/production_cluster/wazuh_dashboard/wazuh/logs/wazuhapp.log b/production_cluster/wazuh_dashboard/wazuh/logs/wazuhapp.log
deleted file mode 100644
index fffe806c..00000000
--- a/production_cluster/wazuh_dashboard/wazuh/logs/wazuhapp.log
+++ /dev/null
@@ -1,38 +0,0 @@
-{"date":"2022-02-10T13:49:44.661Z","level":"info","location":"initialize","message":"Kibana index: .kibana"}
-{"date":"2022-02-10T13:49:44.661Z","level":"info","location":"initialize","message":"App revision: 4301-0"}
-{"date":"2022-02-10T13:49:44.661Z","level":"info","location":"initialize","message":"Total RAM: 11928MB"}
-{"date":"2022-02-10T13:49:45.077Z","level":"error","location":"initialize:checkKibanaStatus","message":"Could not check if the index .wazuh exists due to no permissions for create, delete or check"}
-{"date":"2022-02-10T13:55:00.999Z","level":"error","location":"cron-scheduler|SaveDocument","message":"resource_already_exists_exception"}
-{"date":"2022-02-10T18:35:47.009Z","level":"info","location":"initialize","message":"Kibana index: .kibana"}
-{"date":"2022-02-10T18:35:47.010Z","level":"info","location":"initialize","message":"App revision: 4301-0"}
-{"date":"2022-02-10T18:35:47.010Z","level":"info","location":"initialize","message":"Total RAM: 11928MB"}
-{"date":"2022-02-10T18:35:47.242Z","level":"error","location":"initialize:checkKibanaStatus","message":"Could not check if the index .wazuh exists due to no permissions for create, delete or check"}
-{"date":"2022-02-10T18:40:00.559Z","level":"error","location":"cron-scheduler|SaveDocument","message":"resource_already_exists_exception"}
-{"date":"2022-02-10T18:42:13.894Z","level":"info","location":"initialize","message":"Kibana index: .kibana"}
-{"date":"2022-02-10T18:42:13.894Z","level":"info","location":"initialize","message":"App revision: 4301-0"}
-{"date":"2022-02-10T18:42:13.894Z","level":"info","location":"initialize","message":"Total RAM: 11928MB"}
-{"date":"2022-02-10T18:42:14.231Z","level":"error","location":"initialize:checkKibanaStatus","message":"Could not check if the index .wazuh exists due to no permissions for create, delete or check"}
-{"date":"2022-02-10T18:45:00.330Z","level":"error","location":"cron-scheduler|SaveDocument","message":"resource_already_exists_exception"}
-{"date":"2022-02-10T20:23:03.443Z","level":"info","location":"initialize","message":"Kibana index: .kibana"}
-{"date":"2022-02-10T20:23:03.443Z","level":"info","location":"initialize","message":"App revision: 4301-0"}
-{"date":"2022-02-10T20:23:03.443Z","level":"info","location":"initialize","message":"Total RAM: 11928MB"}
-{"date":"2022-02-10T20:23:04.136Z","level":"error","location":"initialize:checkKibanaStatus","message":"Could not check if the index .wazuh exists due to no permissions for create, delete or check"}
-{"date":"2022-02-10T20:25:00.975Z","level":"error","location":"cron-scheduler|SaveDocument","message":"resource_already_exists_exception"}
-{"date":"2022-02-11T18:48:39.186Z","level":"info","location":"initialize","message":"Kibana index: .kibana"}
-{"date":"2022-02-11T18:48:39.187Z","level":"info","location":"initialize","message":"App revision: 4301-0"}
-{"date":"2022-02-11T18:48:39.187Z","level":"info","location":"initialize","message":"Total RAM: 11928MB"}
-{"date":"2022-02-11T18:48:40.305Z","level":"error","location":"initialize:checkKibanaStatus","message":"Could not check if the index .wazuh exists due to no permissions for create, delete or check"}
-{"date":"2022-02-11T18:50:01.075Z","level":"error","location":"cron-scheduler|SaveDocument","message":"resource_already_exists_exception"}
-{"date":"2022-02-11T19:23:22.847Z","level":"info","location":"initialize","message":"Kibana index: .kibana"}
-{"date":"2022-02-11T19:23:22.848Z","level":"info","location":"initialize","message":"App revision: 4301-0"}
-{"date":"2022-02-11T19:23:22.848Z","level":"info","location":"initialize","message":"Total RAM: 11928MB"}
-{"date":"2022-02-11T19:23:23.646Z","level":"error","location":"initialize:checkKibanaStatus","message":"Could not check if the index .wazuh exists due to no permissions for create, delete or check"}
-{"date":"2022-02-11T19:25:00.244Z","level":"error","location":"cron-scheduler|SaveDocument","message":"resource_already_exists_exception"}
-{"date":"2022-02-11T19:27:28.476Z","level":"info","location":"initialize","message":"Kibana index: .kibana"}
-{"date":"2022-02-11T19:27:28.477Z","level":"info","location":"initialize","message":"App revision: 4301-0"}
-{"date":"2022-02-11T19:27:28.477Z","level":"info","location":"initialize","message":"Total RAM: 11928MB"}
-{"date":"2022-02-11T19:27:28.862Z","level":"error","location":"initialize:checkKibanaStatus","message":"Could not check if the index .wazuh exists due to no permissions for create, delete or check"}
-{"date":"2022-02-11T19:31:58.941Z","level":"info","location":"initialize","message":"Kibana index: .kibana"}
-{"date":"2022-02-11T19:31:58.942Z","level":"info","location":"initialize","message":"App revision: 4301-0"}
-{"date":"2022-02-11T19:31:58.942Z","level":"info","location":"initialize","message":"Total RAM: 11928MB"}
-{"date":"2022-02-11T19:31:59.543Z","level":"error","location":"initialize:checkKibanaStatus","message":"Could not check if the index .wazuh exists due to no permissions for create, delete or check"}
diff --git a/production_cluster/wazuh_indexer_ssl_certs/admin-key.pem b/production_cluster/wazuh_indexer_ssl_certs/admin-key.pem
deleted file mode 100755
index 899e6c99..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/admin-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCo1YF2VM0TNhlh
-0u3N0nhXwNMb9K0w/HPqTB310WfBEkafjN18VtUevrXzYmq11+vaGFLvzPSr5O8u
-tXCKYP6yeaU8JEjvtrj7N/xo1CIeCJmcGcq8jYCWKBp+PCqWu3KHaLgLLp3f7xd3
-s+7E2iJ/XAqRdMTHIjNWet+ka4AHsbpile+7VkvHNpCKwX84+Nh+wXlB4EQ6Glkl
-qHgyAqqJvnGBESN0D0aGzfL8vmWUqUd2oxlZcA+cJAoEAhgr1wNQZ6K+N5qrqvOn
-nvQsltHhqJu4nV9+KaeIORYUliEJKbVa0KvU1BvBY4W/63gtJ4NshXhSW1Mvh31/
-XfEt20olAgMBAAECggEAIdSGWHutjAfvFhb556Ag1RSiOJvSiFpNr8kIx9TqAVn0
-JMxJJT0Q/1QfiWFTGJTngZAWLk7XSApbkvRwVIoS/xg479AlfUMT1eLmBOtc2r/G
-Z+0THq0L8wqeJGVR81okHNXy6uqwX8q83ROE6JT9DKAYzgSj2XMU7mM4pO2VffTf
-eI39G20wUYqj6lroebs4kIRxqdAasMq80PZO63q/lzR4xya3Wq9ZS3aoNBGoSieN
-4p6Dhyn/x8QRBWX9AXx/KrQpSgkBBtBuxllY15tuXZWTL+LENmceRZb/5WgalypN
-wGnS5mt8bEvJ3KPqmWqvpYcgACYGE3OEgBB37jlekQKBgQDcxmH5oo7yxdAMAym3
-gjseyPd8y+ZATc4k3zaSODuHBKnQ2viwFA6UNjvnw2DfvAVVpzHijxJ+ljMIs+ky
-9KX9mHn4jS94JRcyzkXseoHuSPisQfL87/q9JYc0+xssCRnFJ6Ix5FG814q5sQRl
-aNrCT9jUy9b3JpyMewprgU1BGwKBgQDDxZSe9+fKkL5KupzzDoy1+Ohuz03oxPgc
-9zykXJ7rpmAwInq7Pi+Pt0SKbh6qf9O+dXLPSB0FkKqTffehTrYd/Cv4DFZxSVYe
-wfPAy6ci5PNK+wiAedgdDpxAJWktoEnbj5fWVokFekHKaY5FlQU6cNYD138DgG0W
-OGV1AymVvwKBgBurqZ/2JeB7toWq59GeOvayzYIQtD0fA1VPvLE65wsXJImOyFiZ
-SvJ8kamMrVmdYTXJDNGOiQzgmmje072VODC+qZrjZy2xyGSPwefPuvU4pCJC6ceV
-9GE8kOOtDUzJnzc8rnF+Ylg+055Od3SWXcS46T5ShhDYAAsDaNzsidg9AoGARK9A
-Slmtn/sSWEOKpxfWtE1ktuPScLUSW48+XmgEdabEnn6qUqEprKFe0bZ62dTJJEwu
-gJzLWdV8kwyh4Z0s9e4wOvGRLmPNbDMd4ulQdUSgOxFB1VlqQh+LIFI/yXswDnEd
-k1x+7EYNaQeJm84BrJRD8cscS801+JLGvbvjTh8CgYEA3FHIxw+ypuAonCbtjTO8
-KHV0k1pz1Y9OTJmtQLGz6miAgYCfgEKDTzLjtpAbdkE5k3mo3ohewNhYoJ2g+Vn8
-HXPjbT7cGfao92L2CiTCDmAGHdNB/6O00n7JM4t8C41xWqWBLB3LyPJnEqIzLDyZ
-n9Rfm4m1kT+8hRHHkXrKEbM=
------END PRIVATE KEY-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/admin.pem b/production_cluster/wazuh_indexer_ssl_certs/admin.pem
deleted file mode 100755
index ccbcd64e..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/admin.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDDDCCAfQCFER31N2NjvzM7/qZfPeyucBce01CMA0GCSqGSIb3DQEBCwUAMDQx
-DTALBgNVBAsMBERvY3UxDjAMBgNVBAoMBVdhenVoMRMwEQYDVQQHDApDYWxpZm9y
-bmlhMB4XDTIyMDIwNzIwMjg0NFoXDTMyMDIwNTIwMjg0NFowUTELMAkGA1UEBhMC
-VVMxEzARBgNVBAcMCkNhbGlmb3JuaWExDjAMBgNVBAoMBVdhenVoMQ0wCwYDVQQL
-DAREb2N1MQ4wDAYDVQQDDAVhZG1pbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKjVgXZUzRM2GWHS7c3SeFfA0xv0rTD8c+pMHfXRZ8ESRp+M3XxW1R6+
-tfNiarXX69oYUu/M9Kvk7y61cIpg/rJ5pTwkSO+2uPs3/GjUIh4ImZwZyryNgJYo
-Gn48Kpa7codouAsund/vF3ez7sTaIn9cCpF0xMciM1Z636RrgAexumKV77tWS8c2
-kIrBfzj42H7BeUHgRDoaWSWoeDICqom+cYERI3QPRobN8vy+ZZSpR3ajGVlwD5wk
-CgQCGCvXA1Bnor43mquq86ee9CyW0eGom7idX34pp4g5FhSWIQkptVrQq9TUG8Fj
-hb/reC0ng2yFeFJbUy+HfX9d8S3bSiUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-Rny6jig0H/r/ZxZ6Cd1sPYdKQM5NuBYRyY4sc0l6i0Y2o3tJdlLoYxuxgampTgOa
-97t+4H1htfuN5LEZQqIF6sY0xX/3N6m9IMBmE2AYOKXlwInkULg+kg5WBYgqNqd6
-e55OasF8VXwsuIVX+mC4lKRlbXDMScC73BlxEtRuOLxPy3UulrvITP3EdptFHHoP
-jn6rOvYRQnY9wR4SOAJBofYMhU6kV8zF/bqB3ioxEtnPZhkJeyIb89DkasJaP3FJ
-rtjMJb8cyXd5FHGEy8nhIssyUKbTccfnNe29XGCJLfteP8BExFaXLyChMAzhreR/
-h6svqSo4iiviJKIuDcz5pQ==
------END CERTIFICATE-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/root-ca.key b/production_cluster/wazuh_indexer_ssl_certs/root-ca.key
deleted file mode 100755
index 2791e1e4..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/root-ca.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC55KbINhOX1rTi
-vzO23qd8k1K89GBHtssv0J4q2IM2WTG7V4BmSWe+HiUsPSIzY+07O+sSHoTNkxqb
-OcHEovx0ACVsZ9LlxXLu/GDz9p5N3JROQov3W3rjFUaIFJvOADIm/+0zhS6p6wdJ
-zNAwf2rDrE58gXKunPU/njwoB4kkAjYYnYZi1t9aBUjJTIX6t9amqD+/Z7MM9Jt1
-Va3gdL9fkHu6ko2fW9rTnyBwtl/a3jW0dQBS6EPHOLbWsxmYIcKfeG4nIR6RJYbP
-oMDWIUlTCaZ2FSpG8IsTR4BMAbDQp/M7UL5YPLevg6CcnQIYaxuth9CdVMVCn9Bc
-TSA5nSPjAgMBAAECggEBAI1zlQmyRHR814XW8nYLtSzROds4pW7MhI5s035M5INd
-mb8xlS3AW6XKcITaPAUY27MAJB7UhD+d2VgWugBz+WAXoGJ+GnfnKE78UpYxqkIb
-P+rRLopZ3Qeg79uquuglNASDKC7VAC4h/pjEtgLBYi9lFRAevHJsUx5GvQXEvjFc
-BNf9AXHF5O4LTzcGZ+mgYlAFxQjDrnbQuEQ6mhkESViuDbZcP9kExed5q0T+TcY3
-xlLgHoQMH1FnyxzYyNdgwO5t/j7WNYck/djFB3DT0FAp0QsENOH+2g95wfiASF60
-NRt4fsC6IZXj1LTR5qC9u32QpMbu0QBWnq8ZBLdi8tECgYEA50Wk9MDZTSe6VMwV
-3GiyYM+hf8Em270mzQRBsIEd3uJQ2r6iZ4uBK+m39FARq8S60fCe/OgHJ4EbbkhV
-b1nrVbtItUTOBAwa5mNkCsN/tKG9NEHO8CZOYv95+mrqCB+ZBb0s3m3w+mZ1RQcc
-0up3xQHI8jQ5dT4MjWEH16Ldj+sCgYEAzcTmpVIYzjjiBieY5CnWIVYNm6P2ZlUM
-o7DLjhoKe/NognaxyAlZFvepsLs7+NYKBxZlHdQHlsKqrS8QXKuuK/e5hrSakdG6
-OgL/N2+66JaySEz691CI9hddyohepRvKP4113B7WWeglChZOXfPC04ZuCnZ/LyXJ
-FKNgkuyctekCgYEAn7Ihk7hO1M4oBkHenpHVCrCU7iir8nQMhOj5iy29OJjCCCo2
-7pUQHwiGM7fOW/O+pRUoU67MseSe0mo0RG2s6UgnjrPyJi1NreTXwe75EfvVMG54
-vK9W1VlgGyEUdYOMIMBeaUE1c1Koi3+70ZCCH5F59nVFb8Xm2QE1bxtRLv0CgYAE
-a7aI1rqxs4cnmrIuNLfk/3RLY7pneGxNF/9HjkerYg9cvjATnB/N3oRGx78CGZcd
-j92cRnHjS0tfbSNs2kNjrm7N9hNcDqVxmZ7iEgRx+srZws2hgplusBHTyBpAcdhm
-hSODFyaDx/kDvnbwjcwhv0Gd9+3DlYw8ZUYt4ed8AQKBgQCt6/C+s1bUB981pYYf
-0TDDxxQE2CIAJHHrAZ1SSnlj0smt79Xj+3RboClfDwtLLpFFbCfPY9LyLgeBbIq1
-9Tol1lnHkEfhuTI/0Uua6u2uNVbjhqZTXsogvPZjro3BwXiksN7nQp5w5LdqSMF5
-VNv0RDik3Sy2OmfoJ7dn+DJBWA==
------END PRIVATE KEY-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/root-ca.pem b/production_cluster/wazuh_indexer_ssl_certs/root-ca.pem
deleted file mode 100755
index a8a28794..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/root-ca.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgIUUZPpFmFeaHka2OJkT1JS1QIVAhIwDQYJKoZIhvcNAQEL
-BQAwNDENMAsGA1UECwwERG9jdTEOMAwGA1UECgwFV2F6dWgxEzARBgNVBAcMCkNh
-bGlmb3JuaWEwHhcNMjIwMjA3MjAyODQ0WhcNMzIwMjA1MjAyODQ0WjA0MQ0wCwYD
-VQQLDAREb2N1MQ4wDAYDVQQKDAVXYXp1aDETMBEGA1UEBwwKQ2FsaWZvcm5pYTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALnkpsg2E5fWtOK/M7bep3yT
-Urz0YEe2yy/QnirYgzZZMbtXgGZJZ74eJSw9IjNj7Ts76xIehM2TGps5wcSi/HQA
-JWxn0uXFcu78YPP2nk3clE5Ci/dbeuMVRogUm84AMib/7TOFLqnrB0nM0DB/asOs
-TnyBcq6c9T+ePCgHiSQCNhidhmLW31oFSMlMhfq31qaoP79nswz0m3VVreB0v1+Q
-e7qSjZ9b2tOfIHC2X9reNbR1AFLoQ8c4ttazGZghwp94bichHpElhs+gwNYhSVMJ
-pnYVKkbwixNHgEwBsNCn8ztQvlg8t6+DoJydAhhrG62H0J1UxUKf0FxNIDmdI+MC
-AwEAAaNTMFEwHQYDVR0OBBYEFBHZ961QUsmPGJ+Jt0gfyZY4ShnSMB8GA1UdIwQY
-MBaAFBHZ961QUsmPGJ+Jt0gfyZY4ShnSMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBAKKny1ai5hpd93ZMVO8ryVhDX3NiZTSR5cYwIFuHLcQsLkuc
-Su4vhAOGtkm1bWhiu64VveOQXLy9M3qCXVL5q8YJIb9CUBh6emrGaykKFSLY6M8+
-ZuESTcJzdznq9dU8gLr0rsXUZFajMFtiLrNERg25GFQPutnu1t9E8uKnfoNV4EFe
-eNpkrTMt+ioPh1Xpn7WjU//974E4wGtl+wnqM4hqPcjYY4F4X7GBtKnhvQSwqp4D
-Po36mhNbqRwfQYq/QQRbQN+9wMU4DtssttY4C63a1nRUhXvnFMnkserXptq+g1yc
-YJCNtUjb4xcj74+HRuQFKeK07QcRThw8YLYnLS0=
------END CERTIFICATE-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem
deleted file mode 100755
index 9296b786..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC17C9oygkP7enG
-0t8902Zo5JjN9VbGEePZg1kLViPFOcX/TYkDUt74xJAE+vvdGiWfoTKJYKYj9p5z
-MzTQYo/39/iRrLiOenVWjrZmN8VnPsuiEL4D+pLr3832+yG/JneVjERrqs/iD/Lm
-QJbCjGG3ZwiaEpPE/tT77cAN0MwjHY0qoHa4/MJwN/6AZdTg683go1Bo3+lVtWK9
-jtO8eXKlPyypr/6NL6kagHBEzw2V7F7fRZ1wDvxcVcX6tsWBtBGJRdgJ4VLoD2wT
-T0kNMc4vX9IMhCwfsr+8rGyXWCzX1298drulbQjFXzQlD69bloOmENS3h4V/jE+Y
-YrsiACwlAgMBAAECggEAFYNWn+e0ZqPVz2NEbwU+yQyvXTu0BTw8W46CyypmlH4e
-gfBjUXdNUtG7zjr36c+bv2LKnSBGxV32otzdU/8z0zkJtgBc2sx0b8X0n+XcfDca
-0ZF1RvcsxKP0sU5FUVt1LMQnmyvZ5XvJV50vttXvAEc45y9nNhaEjT4yRe/5E/XJ
-fmUzPuZSn8Z+c+HXvWTddMlSD8tqSTc2lkrsfaJSoamp/USVXPNJNac1l+M0YUlm
-M4TDjkKLi2hLbRLgG+ZrvpcRpyrDQsw8hYZkrZvRywSQX+eTkLdGwOwNJIs8Y3pQ
-Oz0d8iAbH1qFo9s16/I7YhTBAANY3jcsqMxhugemQQKBgQDntVP4K3ZkbQTBCv4E
-W1FeMhNuo9kzm3oj0/UucFjEln9pMCaB8EGKdtIW7GFChgUwucL1Nj20cFxmlXQX
-tky7/xMIt+EBVICSY4txi+asHsqBQkCoK2Q/qgt3Z7ORtvOeNn6aEbfuOr5r7qf/
-hvgundkUN12UibWqc9f1dTCSqQKBgQDI/rCo9oQBMEkIqR/RE1uUsISwYfJb/bMo
-zBXjHYZ5/88JNUYDmSSeHOVGBLLjSqRGGP4HuKh1o9ZDzSuEaZxUYiLyQroDCkrk
-doXd2ODrzFOq4vk12z2KCr2PweW2++/I5d3uNC0q8YCTahr+RuevmKFaeMDNskDI
-KGfOg5t3HQKBgDh668/3kDFknZ8MteSL+eaTIEd86wn4YSpwlThPrGOnJ8GVOh28
-Wc2NryJlVkPn9UXuUgaBxULBjNR4o8bP6h59S795SwCO/5QvbaMs7fqQut4NL0OO
-6C3Ynljpz0y6ouGy+ONHZGVOrnISx6Ky3LZIRcz2vfniI4U8Ha04drGZAoGAI4rO
-KIK3IxKrx4lIpAsdRbTVMe+QEO5S8SLtt+SvtAElVkaCY/5/uCn57SDFlWXMmMyw
-lyLzPyJCsGimilq2l0FnVpmwFPuL9Mx0rZ89XtUZ8n0CfqCPSErP7IzoFyyD4W2s
-igPV/OMJzoeT0GUvcSC3X608wuMDi6GBgcZKBo0CgYEA3OCz4QJgP5rlxqhv4VhB
-H71p/oalckrmIytq2V2j1/8EVf7jPWLOxsw0Q+8DL/2tdBI+QLSPA40LCLtNlb3J
-Lbyrav+RyVAwa1C27NdqZ2yZ2xF5iSIbkENHB2QxNkmaVsoSDX2j5fyQhnM+CTEe
-IRLfssBnG1/KgfL2PyO8drQ=
------END PRIVATE KEY-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard.pem
deleted file mode 100755
index 45106ff4..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdDCCAlygAwIBAgIURHfU3Y2O/Mzv+pl897K5wFx7TUgwDQYJKoZIhvcNAQEL
-BQAwNDENMAsGA1UECwwERG9jdTEOMAwGA1UECgwFV2F6dWgxEzARBgNVBAcMCkNh
-bGlmb3JuaWEwHhcNMjIwMjA3MjAyODQ0WhcNMzIwMjA1MjAyODQ0WjBbMQswCQYD
-VQQGEwJVUzETMBEGA1UEBwwKQ2FsaWZvcm5pYTEOMAwGA1UECgwFV2F6dWgxDTAL
-BgNVBAsMBERvY3UxGDAWBgNVBAMMD3dhenVoLmRhc2hib2FyZDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALXsL2jKCQ/t6cbS3z3TZmjkmM31VsYR49mD
-WQtWI8U5xf9NiQNS3vjEkAT6+90aJZ+hMolgpiP2nnMzNNBij/f3+JGsuI56dVaO
-tmY3xWc+y6IQvgP6kuvfzfb7Ib8md5WMRGuqz+IP8uZAlsKMYbdnCJoSk8T+1Pvt
-wA3QzCMdjSqgdrj8wnA3/oBl1ODrzeCjUGjf6VW1Yr2O07x5cqU/LKmv/o0vqRqA
-cETPDZXsXt9FnXAO/FxVxfq2xYG0EYlF2AnhUugPbBNPSQ0xzi9f0gyELB+yv7ys
-bJdYLNfXb3x2u6VtCMVfNCUPr1uWg6YQ1LeHhX+MT5hiuyIALCUCAwEAAaNXMFUw
-HwYDVR0jBBgwFoAUEdn3rVBSyY8Yn4m3SB/JljhKGdIwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBPAwGgYDVR0RBBMwEYIPd2F6dWguZGFzaGJvYXJkMA0GCSqGSIb3DQEB
-CwUAA4IBAQAhcvVs5DRom/6Ci9VINgc1n3+NDAE3HdFZ7TKnMekR/MDeU5l5Kz6t
-dzx+P7mO7MywOgRddKsH9BEIlU2jECVixUBvYXNgr8cflVv5qlFg5QjWuUhAM4W4
-qu1oEITnpSPBw7DbMTQbjK5fQP4VijDWKTjFGpHti4QXxrel9uer0B/dHWQLYIL+
-yh1qCUHp1q02IZFanAbhGi055bR/7r6123EtoyDx0so5qzhZlCm+86m/tO0vqXf2
-sWa2KmL71M2UYSoDrzF3/4LhKEFJ4MRGiB2s7C/1MpRAKKnC7PLOTtykKU/3x0MF
-mk3Xp+GIZkzdbo0eHXYjpghsCp3Kwx6z
------END CERTIFICATE-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh.master-key.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh.master-key.pem
deleted file mode 100755
index 6c7d8b03..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh.master-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC55JMOnYeiyco2
-VYu8+1QX5qA26FAmJgnnWmqqZvOoNoDuyLGlKzuUiKnV0xrHDlsqARQcmUf7hF63
-QQkbZlWR2LkhRKQWLiemIQKVqxyarQ0YD7+yxmk3oaB7BZdkxsZcx0K1FuZcxUqd
-JTRhOvunrPkKuQAJqPxuAtamLS75u+q3YRTN31zRMCZNHqGizzzN1rpIw4gq8WUE
-93UHUKL7r/2wbPiR6TsLk4/oygUEbLNtl06u9Mf19b73KWCoDr1xiJSuDbkC+/b3
-zKWDZmeejiR4CXqUMhm23YVPEmx/unklht3fXyVlRxR/QrBZvXidug+BfATX2TEW
-5Q8+1uuHAgMBAAECggEBAIzNPTYMy/fZsHiHQ1jZZVDVNvVf8ZVzqny6V6DKajQ3
-VGGJUkUxAef3u+xiAh5UGWkvd/RRhdxU3wkfEa7XTGk0JsW0IDVMsGt9BWAoQ3pF
-KW3YP/NBpeClY9DK42lJxmXv5+8ScVpDdcihrZMYAhV3RwuAJS8r+Ee7jqo//xzY
-ljXa1eHhmEO2nxMz4v3yJIqMWHNJoXct5gbk8CBdvuhSgxqV9XxlJhlvRharX+TX
-KnN+ql2OdejlDdvRoT4KzALCxf/csjBheP3KZ3aVr9/gUsPGiMOCnW6tOqc/Fg7z
-zo2y37IWof9HNc1tHE2Sn//c0Az7XLpEFT0iFGydw8ECgYEA6RmsdlKD2E892Qr3
-ApViCC/rrkhKEw9LrSGFd8LdWFUBqdfsd97oK2lStUe4lb+Qz9u4yOgl+dBRAkbR
-sJFoQNwMML00VQKF/P2S30aGehw1OfKvihGfkolJ4EkPE7XbvCwZ/cd0J+TVplag
-UZ4nCaC1DhcPsjI3CBGIA8plI20CgYEAzCep6gpbbI0XdcNwaHW9Ozws9c61LFON
-zbrf0hXMswqZJR3O7piLdzJBBYF/uN7VyVucRle9Ve1lFXgxvxuUkgzZTB81TP7V
-O1+oxR5mhCa24tNxuK3ARvmz8SkyRR56iaSNW6yI0ZLg9pJm/gMslJoaAX0tcDME
-ZVUd6dZLfkMCgYEAiH+RP0R4km1ssTE7jha97j9piogoYFrfnMV5a7T/et9kdvnL
-LjKoz+sAFMmn7IDeIununi9bNZtoJKYl2nh7jSeON+hDwdgVcB1pKTgaPV1RSdq0
-Mmy5fczJJv6BRrCCuQE2QybN/SKCfcJSZRjwkTG7dEHK3jWLhj0F4fpeGU0CgYBG
-qcPqOkOCwyNHo6oYvggNpLp7Kl0TRqhieThXYyxDHHv9mN+zPiGn1EElQrmOp7Kf
-y5G/10a1o0HFuKCfYVB/bOsZqgOs7tengWjNMcSSIURUJpPKNHnFF1DtPDEmM3J+
-ifJTtNh2kbxEHFCBw19+4Af4U/eSSlZPLLL56S6gOQKBgD+NtBcAxggeJZAHONOF
-9qcdERaiygXWPFWTGhtSpy7U8uSBD361UdIs5SeYB44v8r/cW9+9nj5VL/wprujr
-ZhzdhwYaeX05DB7A5zO1sTt2wjoD/otlIvL5nY00NBeaJzRhLkef2peDHHuZ5lET
-Jb0rNPLpp9FN2JWXF233eGzL
------END PRIVATE KEY-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh.master.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh.master.pem
deleted file mode 100755
index 593c73ee..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh.master.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDbjCCAlagAwIBAgIURHfU3Y2O/Mzv+pl897K5wFx7TUYwDQYJKoZIhvcNAQEL
-BQAwNDENMAsGA1UECwwERG9jdTEOMAwGA1UECgwFV2F6dWgxEzARBgNVBAcMCkNh
-bGlmb3JuaWEwHhcNMjIwMjA3MjAyODQ0WhcNMzIwMjA1MjAyODQ0WjBYMQswCQYD
-VQQGEwJVUzETMBEGA1UEBwwKQ2FsaWZvcm5pYTEOMAwGA1UECgwFV2F6dWgxDTAL
-BgNVBAsMBERvY3UxFTATBgNVBAMMDHdhenVoLm1hc3RlcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALnkkw6dh6LJyjZVi7z7VBfmoDboUCYmCedaaqpm
-86g2gO7IsaUrO5SIqdXTGscOWyoBFByZR/uEXrdBCRtmVZHYuSFEpBYuJ6YhApWr
-HJqtDRgPv7LGaTehoHsFl2TGxlzHQrUW5lzFSp0lNGE6+6es+Qq5AAmo/G4C1qYt
-Lvm76rdhFM3fXNEwJk0eoaLPPM3WukjDiCrxZQT3dQdQovuv/bBs+JHpOwuTj+jK
-BQRss22XTq70x/X1vvcpYKgOvXGIlK4NuQL79vfMpYNmZ56OJHgJepQyGbbdhU8S
-bH+6eSWG3d9fJWVHFH9CsFm9eJ26D4F8BNfZMRblDz7W64cCAwEAAaNUMFIwHwYD
-VR0jBBgwFoAUEdn3rVBSyY8Yn4m3SB/JljhKGdIwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwFwYDVR0RBBAwDoIMd2F6dWgubWFzdGVyMA0GCSqGSIb3DQEBCwUAA4IB
-AQAmCAiydzBHx8M7bUWcuxU0uB93TLsGzptpYebd9/Y4C+SrxHjjxQb5gji8D9qL
-/aE3pg6RowBwhAnaCa5DCvFm7mz4sP8HO9Hz1I5w40jjkoIfwPw5kL/66t+pGonu
-SbRzPH/s87vrtgowaF+2U7tNd3iiHFH2ANIJPmAki9XtYWjUgOEaY6R1UhpDOntB
-UNvb6tTpdjkBTZNVDugO7BVQKjXWK1AKn5m08JepLK39cCX+Q120KK7NbRCtcR3u
-CMaqKvZ4sMT/pGwmRbuTxYx11zWsf8tFeMJxv82RVjVwZktSPyEFuX1MzlZ/2ljl
-tf1yaqMCS7yWFYjwzcDZ35Gh
------END CERTIFICATE-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh.worker-key.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh.worker-key.pem
deleted file mode 100755
index dce391b8..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh.worker-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDO2F9laXHl+CAB
-0tLEdEq4CXciYnBpytAuwodoGk3wYn6ZBXxxKs+Mm/0jHSrvmK4qP2jQXS/6+u1s
-2kFBaG1a0/GMVMG/wpJ7aJTT/jK+prc4npCdOLkIHV3CvptV0tJ8nPEAsydY8bBV
-9swqknl+FDMK7yMSez3lbAo+PgPcsKDomt9+nSBnZHqmHpRcie/H6SNm6UgivfYW
-i8LkAKL0uUmlU383ZrUNzso9zXdJhJyY+VEh3QGUppReH+YPP30FUtHuQRtPQxPp
-epLxT2+tKIMremXyyb8KRJJTzhEWXddY9mVJmZeDCU40hCYhK4EPvrGPUH/oriQG
-El+AHy//AgMBAAECggEBAJmM4Ix9EZOBdelEozg5iDpEtI7u+rpeV9tOh4yNcmxQ
-AeEAxJeSC087gVhuz6/b7Pbp6Zo8g2DSpCxZfXXb2spBaiAdz1LWUz2PrmQNYYhM
-ZNmARKSiNiHDAxaNvuygO6dMLlCxrjUF/jxioL+9yrkAr7+fNK8ElDda0+POz7kk
-g8jBGhoaJ4NOpcfD3ifPYvGGsz3fKeEQjfnCGnIgwIin1ZN2C2XJ0Sdi0DTuUWAp
-XLRCXcLbQfMQXWoN+MJza9fRa0ZhkDjsSkBeM8/f2rABmzS/HpHZRsp/xF+qJ/2p
-zO0kKMiTjXwhIY5YQc++gSgg1uGMeaObW2n0O1atQgkCgYEA8gRFtkHmi0/NZyo/
-IAzICT8PLCXKZbZXU/jfBd5NzBJi24+9l1H+wZ52v8gxwUF6XaggHcFlyTdVenMK
-UeOof5SAPg9/BeHE9z7CKkvQthppRnRbpeBHiTpL86UbnNcbzSCcqIwAWUv00tq8
-IBCIMQDts0dqjqIRaN8BFUaU3Z0CgYEA2sve0J6Jf/fat97vwEZncCVhjVwJ6rW4
-CSNqR1T1ZQCiU9H+CSGvn95ZvhwOrESXQxV/Z7S3CHfovPVKXNFBs9XFpKmCBBz/
-YxhIXAch8WM9jLIDqPY/VnbN307AufK1PLF2/StnUTEFLoNQpl2WWQa1LFeSXZvZ
-0oj/+KTJX0sCgYEAz4tOZTA6jznOgiw+mjOb0CId1tRJr9QhK8f/Kj8sJFeYI4Yv
-JneQq2ZDm9AIqxyF3Y9yi1HxAg/L5AiHzxYWx+IH4DDV06t7iDRvumnuAFzB70OV
-3LhrYIl33Oe4uFXYZ58R+ZCmM+3pdHFUZ4MF6FBNiDM0dEEUAQVNHnu66hkCgYEA
-msHG6UKpuQUEBDhA1nw138Hg/U6TiRtdf8E4BBpYtEc9ihInICheg7KPQYOw8TJW
-11FWW3EcYXYG/dh1767nTR8we+aVmvkzvtDHJai53nY2a9Th99mtNSg1N/UJJr1A
-ahyQMERKAMiuhJbHLdVWacPv09xhH6sD6AGVJDbSZH8CgYApvezqoBeDhS5PVt/I
-s9rPy4M0dITb5Wb7gy2R7BtZOdMluPshN87S37j0B7iJB0RwvYNtDftAn4qKSA77
-JHEd/mI+rtUeCzgHginAyKR07yP5EALI21OWTRyyywlpWFAds2H0Kh0v0/P8YHQZ
-W8Z3U7jEifGmclWgxTaZAcvaXA==
------END PRIVATE KEY-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh.worker.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh.worker.pem
deleted file mode 100755
index 51caa4ba..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh.worker.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDbjCCAlagAwIBAgIURHfU3Y2O/Mzv+pl897K5wFx7TUcwDQYJKoZIhvcNAQEL
-BQAwNDENMAsGA1UECwwERG9jdTEOMAwGA1UECgwFV2F6dWgxEzARBgNVBAcMCkNh
-bGlmb3JuaWEwHhcNMjIwMjA3MjAyODQ0WhcNMzIwMjA1MjAyODQ0WjBYMQswCQYD
-VQQGEwJVUzETMBEGA1UEBwwKQ2FsaWZvcm5pYTEOMAwGA1UECgwFV2F6dWgxDTAL
-BgNVBAsMBERvY3UxFTATBgNVBAMMDHdhenVoLndvcmtlcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAM7YX2VpceX4IAHS0sR0SrgJdyJicGnK0C7Ch2ga
-TfBifpkFfHEqz4yb/SMdKu+Yrio/aNBdL/r67WzaQUFobVrT8YxUwb/CkntolNP+
-Mr6mtziekJ04uQgdXcK+m1XS0nyc8QCzJ1jxsFX2zCqSeX4UMwrvIxJ7PeVsCj4+
-A9ywoOia336dIGdkeqYelFyJ78fpI2bpSCK99haLwuQAovS5SaVTfzdmtQ3Oyj3N
-d0mEnJj5USHdAZSmlF4f5g8/fQVS0e5BG09DE+l6kvFPb60ogyt6ZfLJvwpEklPO
-ERZd11j2ZUmZl4MJTjSEJiErgQ++sY9Qf+iuJAYSX4AfL/8CAwEAAaNUMFIwHwYD
-VR0jBBgwFoAUEdn3rVBSyY8Yn4m3SB/JljhKGdIwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwFwYDVR0RBBAwDoIMd2F6dWgud29ya2VyMA0GCSqGSIb3DQEBCwUAA4IB
-AQBQ/4NRC+7aH7DaFGYrr7/ITK0EmhL1e/BnolpesUF3R1uLaRs0rXqMPs1Z+VuX
-jImhICY1Zfrab6dauApHfY4P8P5zg4FOwlNxWWc7GRfPf3Hqo/cfwcv5tcYCRFDW
-5cxK6sQNNmqvBaQup40nXRUUuKPKbkmYEECa80BTriA8ueUE+HrDN2kDnezCwXN7
-25lsMuVYzsSa6qGHH8zCohiB5erEzpfqbA6cZi9nCoQPQyUJj+34uLYKeTjakOf5
-7AVdGRKUMoTMfoY3Azv8lsRAnVqWW9eQLf/z70UED89x5Cv/ZSEDYMWiu8O8DUuA
-bLIFd/5qrrH+MymmldMHHz6p
------END CERTIFICATE-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh1.indexer-key.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh1.indexer-key.pem
deleted file mode 100755
index 27dcbe9b..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh1.indexer-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC839fpwnln76EE
-5JlWxlowMEW+LKUrXkXNH68tul8vSRylxCYLpnsXqlNU0vwoyr8q/zTjkI70HxOG
-lN3G1PVSzMEIim3GxV2yL5kDO7mKvfMF8Ed1/S3jShze5lSjH9wwb3nuk+FI/nEE
-NuM95pu/N5roq4AftR2wyRNU/NvX2ulr4g17uWcWJMZ0hfcTia3IgVAR6uGsu6vY
-I6HmvIrDWGTs8cND829BgvPZbvkuSDHisogFS1XKSNXN4J5uipROR0US96Cfsv+F
-ACbbiHKvYNPbxd6mGf825LhaYsYWQl3WESX7gz1lRk9RHQa3eUoFTTSYOlr98AO+
-npjZNlKTAgMBAAECggEASfTkmLX70AT26fGRUXctzXy5cnQM4ORzNJTZhXBa4Ssh
-uo8JzroLrQKWyroq3tY08OMplIoAT/rzLFmSVc8BmMBwPaXmwlR6EdGteqSiTH+A
-b6zcbokKtNtKXsWWEqHhGF4uQotJRcnL+zh61rw79C4TzFOLQd8rlxPFLBwvAWAb
-NxbAHAHJgbQ4bzcOVT560RkFNyoOJ2owsItRiBYhi8Kl5zIqpzen5EVLlXTritxB
-Rf2RCSHvzI6To+++CSQws9Ge++oa3zf8AI2IU//qtnkrsvBq3eB72n5Stb4mf48g
-R0oO8YHZR0hh0mNshFMXqrSJedfZJL2sw9mY0nh/AQKBgQD5y24ahginvLg+g5QC
-WiYV6geRwKfWwkABDV4BoiKomvga+Un3PxaPesr42NoSHRKwwWnSUfmjRFYIbCs8
-VOvutvAoXJAnGB/V0WwxNwuMEwiXFzONFxPFq92M1dGWAeBRphLqLdKx1pxcpizf
-Bf4f3mf7Tu+rvEFZXX8Wq/2D0wKBgQDBkP2fp2ar9htyLfZjxbDs4ypzy8rcS04d
-zmIWG8iIvEGL9Bf8m4PMe9QDmAy+DHuDdj/18BopnCGG8nbQpL2S0QmNTfJAMfk+
-U37NTg4FsQklrsNht3PxFrpYEbyUjyZBCQtHmWiIHUMLzJWLoj3u24kvU50OJBDa
-ScGMoXJ+QQKBgQCmvPX32nQ4ky5g/C92CnrVsevvjKv8HJngme2gJXwBE8B9MN4A
-nioPCCYoSYf3A1UQi2p5q6J5KwpKgPmzQfRi2dYg+vh2QBIwBaS0jUu16paXVDNj
-AH6AOiKe+bL28LWtiq+hhYjYkKq65WmaTUO+PhUmmSA+gGEWp+RHW/LTZQKBgGjW
-xwe5+3oYCjWFf3X6lSE4yL1/G5jFkMHEDow68BpfHIFY68T91hzi1Ko9qGknCZ7i
-ZTInoYP39JDKsl+/Wo4yeiH2ncb3Si/fuUYpiJ68jF/EkD5Uxo9F6BfbQ3CTN/zx
-kRJunJdcgfvaCwVeEn1UmrDvcJlAH4CbgiFRMFoBAoGBAPD/C8dnvMBYSMH39/EX
-Qt5/DC1DbuXl17AbhMqyE+Chye8965wD7aes0vHahEcBpmUuOYJXP9eQiZO6i7S9
-CHoEos0HEOvBtoL91sA/zeMspmAYcw3f+UuN6gV18FC9KYoDKLLC9iFs8d7KbGLX
-rsawyTEQ5KjqIRjkwFrj+cCL
------END PRIVATE KEY-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh1.indexer.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh1.indexer.pem
deleted file mode 100755
index 17b89577..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh1.indexer.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIURHfU3Y2O/Mzv+pl897K5wFx7TUMwDQYJKoZIhvcNAQEL
-BQAwNDENMAsGA1UECwwERG9jdTEOMAwGA1UECgwFV2F6dWgxEzARBgNVBAcMCkNh
-bGlmb3JuaWEwHhcNMjIwMjA3MjAyODQ0WhcNMzIwMjA1MjAyODQ0WjBaMQswCQYD
-VQQGEwJVUzETMBEGA1UEBwwKQ2FsaWZvcm5pYTEOMAwGA1UECgwFV2F6dWgxDTAL
-BgNVBAsMBERvY3UxFzAVBgNVBAMMDndhenVoMS5pbmRleGVyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvN/X6cJ5Z++hBOSZVsZaMDBFviylK15FzR+v
-LbpfL0kcpcQmC6Z7F6pTVNL8KMq/Kv8045CO9B8ThpTdxtT1UszBCIptxsVdsi+Z
-Azu5ir3zBfBHdf0t40oc3uZUox/cMG957pPhSP5xBDbjPeabvzea6KuAH7UdsMkT
-VPzb19rpa+INe7lnFiTGdIX3E4mtyIFQEerhrLur2COh5ryKw1hk7PHDQ/NvQYLz
-2W75Lkgx4rKIBUtVykjVzeCeboqUTkdFEvegn7L/hQAm24hyr2DT28Xephn/NuS4
-WmLGFkJd1hEl+4M9ZUZPUR0Gt3lKBU00mDpa/fADvp6Y2TZSkwIDAQABo1YwVDAf
-BgNVHSMEGDAWgBQR2fetUFLJjxifibdIH8mWOEoZ0jAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIE8DAZBgNVHREEEjAQgg53YXp1aDEuaW5kZXhlcjANBgkqhkiG9w0BAQsF
-AAOCAQEAGVQTOA082vVf49EeH5ewBRGonuK+FMNtt4woZErbKHkSQvYLBkOhgnSs
-OHRSdU3OLU0Qdxwx0E4VppKNAAlcmwDBeyVkXPUkIu/pOkepp8fhbTDZSbW6mK2f
-0PYd5uyxeHPW6AvpeWh8iUODYSUaceUD4Lu7BJZK2O29MLeAWXw/1tZMbqOHZ9iM
-iIz/QNZLqm6qUBnXQg+a35N3tSDYPS7yF/yyKoIgn6GyXAdRJ/yyx3/N+g2rNsIZ
-mGyeyl4Pnyl3W88YaC8SUjYRzzD+MBEvlZNTQJ4ORllGDIvJI7mMdvCLaXrDEW8A
-axwv/8UwtZnKgmQ9gIKw+v1lFlACWQ==
------END CERTIFICATE-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh2.indexer-key.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh2.indexer-key.pem
deleted file mode 100755
index 0055463a..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh2.indexer-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDiI48jkYeNCC5s
-1rutoWU7aAMdvAdy4HXhkaILBKbmkSJ3sxGjld4gnr8xXgkclx170gDulMAQL78l
-OSKpejMYjVqFtzEy1vXzUnHg8JQOTwu/MDQxcm+vwjEkX9QJSMV+TZTFitbLsQoy
-QKw+6UyDxaMLG0ACBqtHZ9vQ83vtr878oWSJZWOx23hpdgoImUjUdvbFNZ9AouKJ
-ir6NuFgEzNzo6mS2UcW7268NWkoE0rscf8+8nlW8FXG/IbVbBGrAvc6sYLBYSQ8H
-gcl8BEp+5neJ3x44aNwS/gwHaeP6MmYZy0p886RdWuqijc76DNQJN4PkbSm1jj2h
-JTQCinp/AgMBAAECggEAGJlXo73b6ep+6lX9emi5E1pAJIbkpIloKU5nOx2ZbjFR
-d4XiIFJYJGJAWAVrplGF4oc4lLtXnSskds8dRyRE1KHju/HuhyI9BOft/VMON/Q/
-Sd/bfZl+LrdIEzXdYdkpqpCT410z+lpaypagZgOI0Di6gKXJM684CH9yuOsTiwpF
-byVlferSJPao+GohtoVytGlZtq3Qo43jdyr9oFmDVbTOkL3o1QVS1DGkzvcSKtfC
-4QJmWktq7hcs93ywO46L/yd6x7GzSWbah0KI9mu3/e02nBb96ZIQzbebTkn1VMkm
-EWZ4f6Gr869It2aHyO/eKJIzyVFoVquS+XfFS7Fl0QKBgQD5mOwa2ix0v5F1D+vr
-2MuY8m9GfoC6N7H0j3XYuCxKg7cJavuokwXiZYwPD6z/d9KKfm1CdxDSB84QCMDk
-pWmntRupeSOj7b/q+4EbLRfjUyrzvPcDnQ5yX9Feb/2RAXthdTBlPp04Je60lbXP
-MGKitCKb7hQ8urECYYK2h8GaNwKBgQDn8JZ9htlEkBVM0XlhIoLX2v1gxWmwPAWK
-gU0RYV/SyLhOwAZzWfs0VK2ZuITsitlGGYUXNjETLlT9SQJ9mwoP3fBuRSPgYyIe
-VUrBKZa+X0qYeTctS6ugirCJnR+QGVbt20aw4i/xSPAqLOb3gwHPEVfUMXvOawNh
-WONsXrbd+QKBgQDSNrVDuFSQz3cWfJ5aOHDhE+4cFRcdvyKlst2x9Qt4ho515CCn
-zYu7LYNUfANb9fLgqbIjtFv6SJCIeJbc+2OM17/AcEJQIkDtC32lAcmIr9cRCSmR
-ZYlxUrnnK7MHmZPsdOKZoq6PR4NPnHdPVJT+K3Cqm014CFRkiPOp/5RS6QKBgE7z
-+fZvAeSx+14z7FKhcdLSy++2I70HIYe9biOddwYEp6C/AzMfDUEKFjI+upjexwly
-xHhbTSdPXUT/JmblcO5nyWFwDb9jX4jd1d2dL6BMRdNTZ/H2UU0MCP4/SzA9P/cl
-7pFl3ZYQExj4QgM9SE9ZgwFLeu6QRQ1NOdV5BFzZAoGBAIfYeUOo3D0dPfYhQMau
-wUYR/dWyqWyXh27Bz7AbXLz4YxoIh/bPRthPqjit+9WSpIIvL94u68HDplhAiXWx
-SLHDZlD2voMI3z26bzXfOYiWH7ULGIenPZKPnEAUCOXXzujFD+K2Rqw12Mji5C5C
-Ic3JeVlln8v46SXgyrKqu6jj
------END PRIVATE KEY-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh2.indexer.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh2.indexer.pem
deleted file mode 100755
index 54d7d377..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh2.indexer.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIURHfU3Y2O/Mzv+pl897K5wFx7TUQwDQYJKoZIhvcNAQEL
-BQAwNDENMAsGA1UECwwERG9jdTEOMAwGA1UECgwFV2F6dWgxEzARBgNVBAcMCkNh
-bGlmb3JuaWEwHhcNMjIwMjA3MjAyODQ0WhcNMzIwMjA1MjAyODQ0WjBaMQswCQYD
-VQQGEwJVUzETMBEGA1UEBwwKQ2FsaWZvcm5pYTEOMAwGA1UECgwFV2F6dWgxDTAL
-BgNVBAsMBERvY3UxFzAVBgNVBAMMDndhenVoMi5pbmRleGVyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4iOPI5GHjQgubNa7raFlO2gDHbwHcuB14ZGi
-CwSm5pEid7MRo5XeIJ6/MV4JHJcde9IA7pTAEC+/JTkiqXozGI1ahbcxMtb181Jx
-4PCUDk8LvzA0MXJvr8IxJF/UCUjFfk2UxYrWy7EKMkCsPulMg8WjCxtAAgarR2fb
-0PN77a/O/KFkiWVjsdt4aXYKCJlI1Hb2xTWfQKLiiYq+jbhYBMzc6OpktlHFu9uv
-DVpKBNK7HH/PvJ5VvBVxvyG1WwRqwL3OrGCwWEkPB4HJfARKfuZ3id8eOGjcEv4M
-B2nj+jJmGctKfPOkXVrqoo3O+gzUCTeD5G0ptY49oSU0Aop6fwIDAQABo1YwVDAf
-BgNVHSMEGDAWgBQR2fetUFLJjxifibdIH8mWOEoZ0jAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIE8DAZBgNVHREEEjAQgg53YXp1aDIuaW5kZXhlcjANBgkqhkiG9w0BAQsF
-AAOCAQEAO55yywT1a1Bd7zAQOeyl5c+aMQpyuwipyiZ6kc+1EI84EmhYh59zalzl
-pCb/aQxq/A4Bk0UZAKTBmtBMAMQGiTWTwDMhthEV30j+UgeNCqtMvw5WynZPaS/x
-pWuHCPy0HXw2xAFJpMF7iPWyrQOyPsFQJ5WrNsDevLEOhBTj4Z/kgM7Jwpyjb7JU
-oU7BOoTrxwWKu61lyXXQuddEHSqJhjWk9aa8HXhtU+fz6xqjfgOWw8sAbrtZktXf
-jGgu0xHie6zqAzVeFY6oRe5TJFMr6G/sqgxXfr3Pyg3OaMLZFjkFwKz7NPGVdWva
-XvCRx0USefxMjNBQ9hmtn1qqGt9tow==
------END CERTIFICATE-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh3.indexer-key.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh3.indexer-key.pem
deleted file mode 100755
index 729dce76..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh3.indexer-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCyBBUzH5lWIOeo
-7IpeE83TwIpnv8vhEPZOD5rv7SUNMhPmATVhmX6oGfWuX5KKPGZHH0vMUZBQNha1
-G2VXqeHMk+xDoYDNpRptfv2VE97/tbwTlECiWKx99LEc0FskXY7AxXyK6agx5R6G
-C7JWVoeHBsOQ4XWqA+Uu6KkCjHWEN4MiPJdqCDerNVWdcqzowRdkeJE4sbZed2OO
-Yt3eCrWMZ4ttro9caoY8xkBiI6DEOD35we3IWkB+6qn/Uhd5avgMYaLI4Y6hE8Ov
-w2h6tiu9YrVexLf1swd5C7L7bTUtAgenk+sFANx70hGHytL+P+80LJUSTw1JdLm4
-3EOnGcjNAgMBAAECggEANb/d1s3XspXE3NBvBvDb2O/t2l2i5ZYFiJRVp9PmuBFC
-yNPclleOUptj/v6EdJDAIQFmFY8bD90FBjH7a3iz4N1ZHSKKjY0oaZ9KWdTiJDtv
-SkodKee0TWOwho6ytkw5aiM284qRal9P1BF8C22dBjwYmIo6yNbcQEmnnkliwkSv
-O1U3xUPyfgkQsS/ZSeKCuDWtcxBRA4lHz83PE36V/QsBwE/cUdyjj70VdR2TA2HI
-z7nN+C3VRmsYOBA2FrcrH20DJyZuDA7UOU1VoYyPd98cvI/k9HLHOj9Ct2ntS25q
-KjbY749qtUItwuDLmJGlze1MyMazAL85e6hlSsr3AQKBgQDpSzwbSRoaKBTSj2TH
-idLD/vx76T7M0rNi+17MrVQQmWxlkff4xY+1tnhBz8G5edUUXilgX95zrGK/J40K
-J2zXLsgPMV/Jm68Yw1ZvC2lNacx0mPMn62NVTtOzvI2cHc7ECiOFLufTip2iLKlJ
-FIJHRK5juSdmWOFXPqbTaMytsQKBgQDDV4oYiEaOgV+O4E00Q9E8Osl6QxwhBbUO
-K4yyoPx8VNMcMKnZlNL7a1XYP9smDJbbWC97HYClSINHEdN2R7rvXEdQk0t4TCyE
-UUNvIBi+mVzApccxfcQH5iMhQvQHhmGBtIF8XhagCghboEklZlXRVwBoo/1tnAqi
-3fSjEigH3QKBgQCKVaddkppcujmmpYqf23TT7YYvv54SfDoMzntnKLw5X5BsJgMB
-S7yshneGprf70GduPWuRjydsNeMT8FLsm3Ypnr7Ya3GeLafFKkc9b2nQkpS+6tb8
-a9KqCiT0ZjEeSnqJum1Xkvm6cW6JdKwo/nVF5071KRxYzwlH34mywGjl8QKBgBZS
-bYxqHi3wqLvJ8+iSC1nnmdhnzNIVNeBdp6FN9iw7ATjKcs5TTFzAojmo6mEJtT9x
-b1ORRn8cryuy5MgyYDE0CU4y1r/zbG7eXmdXcpxtKAU3rHCCX6FLch496Wbmu0O4
-HcfZdJprKxNVWKZ2cD4QxBIxEyewWiLMXEU6MOrdAoGAQge11psrXgfmlewBbhSQ
-rBl3Hqqf74O7gErhxJP+sXTL2aG1ytLJlQhB5FaN9OSGAXga0LLTVrXp/SzOXhHy
-Ca/hcAhVV7buLbpawd/EDWXKOwn82YQW4Y08DnrLfVcT7xU3ZC6Qk/Q85+Mq8Qw7
-3x3sgnSDoQWstXmqeCD3NlY=
------END PRIVATE KEY-----
diff --git a/production_cluster/wazuh_indexer_ssl_certs/wazuh3.indexer.pem b/production_cluster/wazuh_indexer_ssl_certs/wazuh3.indexer.pem
deleted file mode 100755
index 32f80686..00000000
--- a/production_cluster/wazuh_indexer_ssl_certs/wazuh3.indexer.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIURHfU3Y2O/Mzv+pl897K5wFx7TUUwDQYJKoZIhvcNAQEL
-BQAwNDENMAsGA1UECwwERG9jdTEOMAwGA1UECgwFV2F6dWgxEzARBgNVBAcMCkNh
-bGlmb3JuaWEwHhcNMjIwMjA3MjAyODQ0WhcNMzIwMjA1MjAyODQ0WjBaMQswCQYD
-VQQGEwJVUzETMBEGA1UEBwwKQ2FsaWZvcm5pYTEOMAwGA1UECgwFV2F6dWgxDTAL
-BgNVBAsMBERvY3UxFzAVBgNVBAMMDndhenVoMy5pbmRleGVyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsgQVMx+ZViDnqOyKXhPN08CKZ7/L4RD2Tg+a
-7+0lDTIT5gE1YZl+qBn1rl+SijxmRx9LzFGQUDYWtRtlV6nhzJPsQ6GAzaUabX79
-lRPe/7W8E5RAolisffSxHNBbJF2OwMV8iumoMeUehguyVlaHhwbDkOF1qgPlLuip
-Aox1hDeDIjyXagg3qzVVnXKs6MEXZHiROLG2XndjjmLd3gq1jGeLba6PXGqGPMZA
-YiOgxDg9+cHtyFpAfuqp/1IXeWr4DGGiyOGOoRPDr8NoerYrvWK1XsS39bMHeQuy
-+201LQIHp5PrBQDce9IRh8rS/j/vNCyVEk8NSXS5uNxDpxnIzQIDAQABo1YwVDAf
-BgNVHSMEGDAWgBQR2fetUFLJjxifibdIH8mWOEoZ0jAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIE8DAZBgNVHREEEjAQgg53YXp1aDMuaW5kZXhlcjANBgkqhkiG9w0BAQsF
-AAOCAQEAnyLfdPMfYjP3su7tAtXzo3/yBM3X9h+90ziWU3Nt8FcECS1vkOxeyNWN
-HjoQ62D1pVDNcX1ul5ue3p5IkGACQFWSvK8Ts/BCPkD7XLSg2NQ/ILOvknUcKM6m
-JtCdPO/Y6E1nhTb51G58LQx6W7/U7kfiDYm/G/0fxfcQNlhkmii0btNMqR6yCNUb
-dCeSuQEXT+gobUVyymXMN7DXzpe+dHG74Zs28v7sp0cdCONVab2PW1sD0/v5Nmcd
-j+XxcKbnaxjiHEABd2c6U7eNjPbGo1Y2AqeLY8DWgOA3y/wA3+c292X9M5F3WBUM
-CCjfJjwHLYvQVSWoNKaIDC196sZtgg==
------END CERTIFICATE-----
diff --git a/wazuh-dashboard/Dockerfile b/wazuh-dashboard/Dockerfile
index bf2c6443..adb545a5 100644
--- a/wazuh-dashboard/Dockerfile
+++ b/wazuh-dashboard/Dockerfile
@@ -17,12 +17,16 @@ COPY config/wazuh_app_config.sh /
 
 COPY config/dashboard.yml /etc/wazuh-dashboard/
 
+COPY config/wazuh.yml /usr/share/wazuh-dashboard/data/wazuh/config/
+
 RUN chmod 700 /entrypoint.sh
 
 RUN chmod 700 /wazuh_app_config.sh
 
 RUN chown 101:101 /etc/wazuh-dashboard/dashboard.yml && chmod 664 /etc/wazuh-dashboard/dashboard.yml
 
+RUN chown -R 101:101 /usr/share/wazuh-dashboard/data/wazuh && chmod -R 775 /usr/share/wazuh-dashboard/data/wazuh
+
 # Services ports
 EXPOSE 5601
 
diff --git a/wazuh-dashboard/config/dashboard.yml b/wazuh-dashboard/config/dashboard.yml
index 7aec4657..31bdf8f7 100644
--- a/wazuh-dashboard/config/dashboard.yml
+++ b/wazuh-dashboard/config/dashboard.yml
@@ -1,14 +1,16 @@
 server.host: 0.0.0.0
 server.port: 5601
 opensearch.hosts: https://wazuh1.indexer:9700
-opensearch.ssl.verificationMode: certificate
-opensearch.username: kibanaserver
-opensearch.password: kibanaserver
-opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"]
-opensearch_security.multitenancy.enabled: false
+opensearch.ssl.verificationMode: none
+opensearch.username: "kibanaserver"
+opensearch.password: "kibanaserver"
+opensearch.requestHeadersWhitelist: [ authorization,securitytenant ]
+opensearch_security.multitenancy.enabled: true
+opensearch_security.multitenancy.tenants.preferred: ["Private", "Global"]
 opensearch_security.readonly_mode.roles: ["kibana_read_only"]
-server.ssl.enabled: false
+server.ssl.enabled: true
 server.ssl.key: "/etc/wazuh-dashboard/certs/demo-dashboard-key.pem"
 server.ssl.certificate: "/etc/wazuh-dashboard/certs/demo-dashboard.pem"
 opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"]
 uiSettings.overrides.defaultRoute: /app/wazuh?security_tenant=global
+
diff --git a/wazuh-dashboard/config/wazuh.yml b/wazuh-dashboard/config/wazuh.yml
new file mode 100644
index 00000000..62a72893
--- /dev/null
+++ b/wazuh-dashboard/config/wazuh.yml
@@ -0,0 +1,7 @@
+hosts:
+  - default:
+     url: https://wazuh.manager
+     port: 55000
+     username: wazuh-wui
+     password: wazuh-wui
+     run_as: false
diff --git a/wazuh-indexer/Dockerfile b/wazuh-indexer/Dockerfile
index bb4d533b..04972402 100644
--- a/wazuh-indexer/Dockerfile
+++ b/wazuh-indexer/Dockerfile
@@ -1,3 +1,4 @@
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal AS builder
 
 ENV tini_bin="tini-amd64"
diff --git a/wazuh-indexer/config/config.sh b/wazuh-indexer/config/config.sh
index 93aa41ee..59f8c1d4 100644
--- a/wazuh-indexer/config/config.sh
+++ b/wazuh-indexer/config/config.sh
@@ -1,3 +1,4 @@
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
diff --git a/wazuh-indexer/config/entrypoint.sh b/wazuh-indexer/config/entrypoint.sh
index 81ca3188..14062a13 100644
--- a/wazuh-indexer/config/entrypoint.sh
+++ b/wazuh-indexer/config/entrypoint.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 set -e
 
 # Files created by Elasticsearch should always be group writable too
@@ -88,7 +89,7 @@ if [[ "$(id -u)" == "0" ]]; then
 fi
 
 if [[ "$DISCOVERY" == "single-node" ]]; then
-  # run securityadmin.sh for single node
+  # run securityadmin.sh for single node with CACERT, CERT and KEY parameter
   nohup /securityadmin.sh &
 fi
 
diff --git a/wazuh-indexer/config/securityadmin.sh b/wazuh-indexer/config/securityadmin.sh
index 1fe6af34..0283ae8d 100644
--- a/wazuh-indexer/config/securityadmin.sh
+++ b/wazuh-indexer/config/securityadmin.sh
@@ -1,2 +1,3 @@
-sleep 50
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+sleep 30
 bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -cd /usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/ -nhnv -cacert  $CACERT -cert $CERT -key $KEY -p 9800 -icl
\ No newline at end of file