diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
index a91d6b1e..a34ef3d1 100644
--- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
+++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
@@ -204,6 +204,11 @@ sed -i "/<cluster>/,/<\/cluster>/ s|<node_type>.*</node_type>|<node_type>$WAZUH_
 # --------------------------
 sed -i "/<cluster>/,/<\/cluster>/ s|<key>.*</key>|<key>$WAZUH_CLUSTER_KEY</key>|" "$OSSEC_CONF"
 
+# --------------------------
+# Cluster: bind_addr
+# --------------------------
+sed -i "/<cluster>/,/<\/cluster>/ s|<bind_addr>.*</bind_addr>|<bind_addr>$WAZUH_CLUSTER_BIND_ADDR</bind_addr>|" "$OSSEC_CONF"
+
 # --------------------------
 # Cluster: nodes list
 # --------------------------
diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml
index 9a76bb7b..7123d62a 100644
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -17,9 +17,10 @@ services:
       - "55000:55000"
     environment:
       - WAZUH_INDEXER_HOSTS=wazuh1.indexer:9200,wazuh2.indexer:9200,wazuh3.indexer:9200
-      - WAZUH_NODE_NAME=wazuh.master
+      - WAZUH_NODE_NAME=master
       - WAZUH_NODE_TYPE=master
-      - WAZUH_CLUSTER_NODES=wazuh.master,wazuh.worker
+      - WAZUH_CLUSTER_BIND_ADDR=0.0.0.0
+      - WAZUH_CLUSTER_NODES=wazuh.master
       - INDEXER_USERNAME=admin
       - INDEXER_PASSWORD=admin
       - API_USERNAME=wazuh-wui
@@ -48,9 +49,10 @@ services:
         hard: 655360
     environment:
       - WAZUH_INDEXER_HOSTS=wazuh1.indexer:9200,wazuh2.indexer:9200,wazuh3.indexer:9200
-      - WAZUH_NODE_NAME=wazuh.worker
+      - WAZUH_NODE_NAME=worker01
       - WAZUH_NODE_TYPE=worker
-      - WAZUH_CLUSTER_NODES=wazuh.master,wazuh.worker
+      - WAZUH_CLUSTER_BIND_ADDR=0.0.0.0
+      - WAZUH_CLUSTER_NODES=wazuh.master
       - INDEXER_USERNAME=admin
       - INDEXER_PASSWORD=admin
       - API_USERNAME=wazuh-wui
diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index 454d900b..d5bf48c5 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -18,7 +18,7 @@ services:
       - "55000:55000"
     environment:
       - WAZUH_INDEXER_HOSTS=wazuh.indexer:9200
-      - WAZUH_NODE_NAME=wazuh.manager
+      - WAZUH_NODE_NAME=manager
       - WAZUH_CLUSTER_NODES=wazuh.manager
       - INDEXER_USERNAME=admin
       - INDEXER_PASSWORD=admin