diff --git a/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/beats/filebeat.yml b/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/beats/filebeat.yml
index 369daa45..f552bf08 100644
--- a/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/beats/filebeat.yml
+++ b/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/beats/filebeat.yml
@@ -27,7 +27,8 @@ processors:
             container.image.name: docker.elastic.co/beats/metricbeat-oss
   - add_fields:
       fields:
-        cluster-id: ${OPENVIDU_PRO_CLUSTER_ID:undefined}
+        cluster_id: ${OPENVIDU_PRO_CLUSTER_ID:${DOMAIN_OR_PUBLIC_IP}}
+        cluster_role: masternode
 
 output:
   elasticsearch:
diff --git a/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/beats/metricbeat.yml b/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/beats/metricbeat.yml
index 09a68d9a..d8cafc3b 100644
--- a/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/beats/metricbeat.yml
+++ b/openvidu-server/deployments/pro/docker-compose/aws-asg-openvidu-server-pro/beats/metricbeat.yml
@@ -1,10 +1,39 @@
 metricbeat.modules:
-- module: nginx
-  metricsets: ["stubstatus"]
-  enabled: true
-  period: 10s
-  hosts: ["http://127.0.0.1"]
-  server_status_path: "nginx_status"
+  - module: nginx
+    metricsets: ["stubstatus"]
+    enabled: true
+    period: ${OPENVIDU_PRO_STATS_MONITORING_INTERVAL}s
+    hosts: ["http://127.0.0.1"]
+    server_status_path: "nginx_status"
+  - module: system
+    metricsets:
+      - cpu
+      - diskio
+      - memory
+      - network
+      - filesystem
+      - fsstat
+      - process_summary
+      - uptime
+    filesystem.ignore_types: [nfs, smbfs, autofs, devtmpfs, devpts, hugetlbfs, tmpfs, sysfs, securityfs, cgroup2, cgroup, pstore, debugfs, configfs, fusectl, proc, fuse.lxcfs, squashfs]
+    processes: ['.*']
+    processors:
+      - drop_event:
+            when:
+              or:
+                - regexp:
+                      system.network.name: '^(veth|lo|docker|br-)($|)'
+                - regexp:
+                      system.filesystem.mount_point: '^/(sys|cgroup|proc|dev|etc|host)($|/)'
+                - regexp:
+                      system.filesystem.mount_point: '^/hostfs/(sys|cgroup|proc|dev|etc|host)($|/)'
+    enabled: true
+    period: ${OPENVIDU_PRO_STATS_MONITORING_INTERVAL}s
+    cpu.metrics: [normalized_percentages]
+fields:
+    cluster_id: ${OPENVIDU_PRO_CLUSTER_ID:${DOMAIN_OR_PUBLIC_IP}}
+    cluster_role: masternode
 output:
   elasticsearch:
     hosts: ["${OPENVIDU_PRO_ELASTICSEARCH_HOST}"]
+setup.ilm.enabled: false
\ No newline at end of file
diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/beats/filebeat.yml b/openvidu-server/deployments/pro/docker-compose/media-node/beats/filebeat.yml
index 5321e49a..d03531c8 100644
--- a/openvidu-server/deployments/pro/docker-compose/media-node/beats/filebeat.yml
+++ b/openvidu-server/deployments/pro/docker-compose/media-node/beats/filebeat.yml
@@ -11,8 +11,8 @@ filebeat.inputs:
     fields:
       kurento-media-server: true
       ip: ${MEDIA_NODE_IP}
-      cluster-id: ${CLUSTER_ID}
-      cluster-role: media-node
+      cluster_id: ${CLUSTER_ID}
+      cluster_role: medianode
     fields_under_root: true
 
 processors:
diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/beats/metricbeat-elasticsearch.yml b/openvidu-server/deployments/pro/docker-compose/media-node/beats/metricbeat-elasticsearch.yml
index c53714a7..5af7641c 100644
--- a/openvidu-server/deployments/pro/docker-compose/media-node/beats/metricbeat-elasticsearch.yml
+++ b/openvidu-server/deployments/pro/docker-compose/media-node/beats/metricbeat-elasticsearch.yml
@@ -1,18 +1,4 @@
 metricbeat.modules:
-  - module: docker
-    metricsets:
-      - "container"
-      - "cpu"
-      - "diskio"
-      - "event"
-      - "healthcheck"
-      - "info"
-      - "image"
-      - "memory"
-      - "network"
-    hosts: ["unix:///var/run/docker.sock"]
-    period: ${OPENVIDU_PRO_CLUSTER_LOAD_INTERVAL}0s
-    enabled: true
   - module: system
     metricsets:
       - cpu
@@ -42,7 +28,7 @@ metricbeat.modules:
     enabled: true
     period: ${OPENVIDU_PRO_CLUSTER_LOAD_INTERVAL}0s
     cpu.metrics: [normalized_percentages]
-fields: {ip: "${MEDIA_NODE_IP}", cluster-id: "${CLUSTER_ID}", cluster-role: media-node}
+fields: {ip: "${MEDIA_NODE_IP}", cluster_id: "${CLUSTER_ID}", cluster_role: medianode}
 pipeline:
   queue.mem.events: 0
 setup.ilm.enabled: false
diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/filebeat.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/filebeat.yml
index fb9c3649..f552bf08 100644
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/filebeat.yml
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/filebeat.yml
@@ -27,8 +27,8 @@ processors:
             container.image.name: docker.elastic.co/beats/metricbeat-oss
   - add_fields:
       fields:
-        cluster-id: ${OPENVIDU_PRO_CLUSTER_ID:undefined}
-        cluster-role: openvidu-server-pro
+        cluster_id: ${OPENVIDU_PRO_CLUSTER_ID:${DOMAIN_OR_PUBLIC_IP}}
+        cluster_role: masternode
 
 output:
   elasticsearch:
diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/metricbeat.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/metricbeat.yml
index 520bea26..d8cafc3b 100644
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/metricbeat.yml
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/metricbeat.yml
@@ -1,18 +1,4 @@
 metricbeat.modules:
-  - module: docker
-    metricsets:
-      - "container"
-      - "cpu"
-      - "diskio"
-      - "event"
-      - "healthcheck"
-      - "info"
-      - "image"
-      - "memory"
-      - "network"
-    hosts: ["unix:///var/run/docker.sock"]
-    period: ${OPENVIDU_PRO_STATS_MONITORING_INTERVAL}s
-    enabled: true
   - module: nginx
     metricsets: ["stubstatus"]
     enabled: true
@@ -44,7 +30,9 @@ metricbeat.modules:
     enabled: true
     period: ${OPENVIDU_PRO_STATS_MONITORING_INTERVAL}s
     cpu.metrics: [normalized_percentages]
-fields: {cluster-role: openvidu-server-pro}
+fields:
+    cluster_id: ${OPENVIDU_PRO_CLUSTER_ID:${DOMAIN_OR_PUBLIC_IP}}
+    cluster_role: masternode
 output:
   elasticsearch:
     hosts: ["${OPENVIDU_PRO_ELASTICSEARCH_HOST}"]