diff --git a/modules/common/monitoring/mongo/1.0/main.tf b/modules/common/monitoring/mongo/1.0/main.tf
index 21f9b1d..d51f889 100644
--- a/modules/common/monitoring/mongo/1.0/main.tf
+++ b/modules/common/monitoring/mongo/1.0/main.tf
@@ -36,8 +36,9 @@ resource "helm_release" "mongodb_exporter" {
 
           # ServiceMonitor configuration for Prometheus Operator
           serviceMonitor = {
-            enabled  = true
-            interval = local.metrics_interval
+            enabled       = true
+            interval      = local.metrics_interval
+            scrapeTimeout = "30s" # Increased from default 10s to handle collection stats timeouts
 
             additionalLabels = {
               # Required: Prometheus Operator uses serviceMonitorSelector.matchLabels.release
diff --git a/modules/common/monitoring/mongo/1.0/mongo-dashboard.tf.json b/modules/common/monitoring/mongo/1.0/mongo-dashboard.tf.json
index 53352a5..81da5be 100644
--- a/modules/common/monitoring/mongo/1.0/mongo-dashboard.tf.json
+++ b/modules/common/monitoring/mongo/1.0/mongo-dashboard.tf.json
@@ -1550,8 +1550,8 @@
                 "uid": "prometheus"
               },
               "editorMode": "code",
-              "expr": "mongodb_rs_members_id{facets_resource_type=\"mongo\",facets_resource_name=\"${var.instance_name}\", member_state=\"PRIMARY\"}",
-              "legendFormat": "{{member_state}} - {{instance}}",
+              "expr": "label_replace(mongodb_rs_members_id{facets_resource_type=\"mongo\",facets_resource_name=\"${var.instance_name}\", member_state=\"PRIMARY\"}, \"pod_name\", \"$1\", \"member_idx\", \"([^.]+).*\")",
+              "legendFormat": "{{pod_name}}",
               "range": true,
               "refId": "A"
             }
@@ -1646,8 +1646,8 @@
                 "uid": "prometheus"
               },
               "editorMode": "code",
-              "expr": "mongodb_rs_members_pingMs{facets_resource_type=\"mongo\",facets_resource_name=\"${var.instance_name}\"}",
-              "legendFormat": "{{member_state}} - {{instance}}",
+              "expr": "label_replace(mongodb_rs_members_pingMs{facets_resource_type=\"mongo\",facets_resource_name=\"${var.instance_name}\"}, \"pod_name\", \"$1\", \"member_idx\", \"([^.]+).*\")",
+              "legendFormat": "{{pod_name}}",
               "range": true,
               "refId": "A"
             }
@@ -1815,8 +1815,8 @@
                 "uid": "prometheus"
               },
               "editorMode": "code",
-              "expr": "mongodb_rs_members_id{facets_resource_type=\"mongo\",facets_resource_name=\"${var.instance_name}\", member_state=\"SECONDARY\"}",
-              "legendFormat": "{{member_state}} - {{instance}}",
+              "expr": "label_replace(mongodb_rs_members_id{facets_resource_type=\"mongo\",facets_resource_name=\"${var.instance_name}\", member_state=\"SECONDARY\"}, \"pod_name\", \"$1\", \"member_idx\", \"([^.]+).*\")",
+              "legendFormat": "{{pod_name}}",
               "range": true,
               "refId": "A"
             }