diff --git a/deploy/helm/prometheus-overrides.yaml b/deploy/helm/prometheus-overrides.yaml
index ff0fe1c231..607b5bd8c9 100644
--- a/deploy/helm/prometheus-overrides.yaml
+++ b/deploy/helm/prometheus-overrides.yaml
@@ -85,15 +85,15 @@ prometheus:
       # cadvisor container metrics
       - url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.container
         writeRelabelConfigs:
+          - action: labelmap
+            regex: container_name
+            replacement: container
           - action: drop
             regex: POD
             sourceLabels: [container]
-          - action: drop
-            regex: POD
-            sourceLabels: [container_name]
           - action: keep
             regex: kubelet;.+;(?:container_cpu_load_average_10s|container_cpu_system_seconds_total|container_cpu_usage_seconds_total|container_cpu_cfs_throttled_seconds_total|container_memory_usage_bytes|container_memory_swap|container_memory_working_set_bytes|container_spec_memory_limit_bytes|container_spec_memory_swap_limit_bytes|container_spec_memory_reservation_limit_bytes|container_spec_cpu_quota|container_spec_cpu_period|container_fs_usage_bytes|container_fs_limit_bytes|container_fs_reads_bytes_total|container_fs_writes_bytes_total|)
-            sourceLabels: [job,container_name,__name__]
+            sourceLabels: [job,container,__name__]
       # cadvisor aggregate container metrics
       - url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.container
         writeRelabelConfigs:
diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
index a30be258f4..af1d2ffc3f 100644
--- a/deploy/helm/sumologic/values.yaml
+++ b/deploy/helm/sumologic/values.yaml
@@ -397,15 +397,15 @@ prometheus-operator:
         # cadvisor container metrics
         - url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.container
           writeRelabelConfigs:
+            - action: labelmap
+              regex: container_name
+              replacement: container
             - action: drop
               regex: POD
               sourceLabels: [container]
-            - action: drop
-              regex: POD
-              sourceLabels: [container_name]
             - action: keep
               regex: kubelet;.+;(?:container_cpu_load_average_10s|container_cpu_system_seconds_total|container_cpu_usage_seconds_total|container_cpu_cfs_throttled_seconds_total|container_memory_usage_bytes|container_memory_swap|container_memory_working_set_bytes|container_spec_memory_limit_bytes|container_spec_memory_swap_limit_bytes|container_spec_memory_reservation_limit_bytes|container_spec_cpu_quota|container_spec_cpu_period|container_fs_usage_bytes|container_fs_limit_bytes|container_fs_reads_bytes_total|container_fs_writes_bytes_total|)
-              sourceLabels: [job,container_name,__name__]
+              sourceLabels: [job,container,__name__]
         # cadvisor aggregate container metrics
         - url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.container
           writeRelabelConfigs:
diff --git a/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet b/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet
index 47c8f6abc2..050a1b7ac8 100644
--- a/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet
+++ b/deploy/kubernetes/kube-prometheus-sumo-logic-mixin.libsonnet
@@ -74,17 +74,15 @@
         url: $._config.sumologicCollectorSvc + "prometheus.metrics.container",
         writeRelabelConfigs: [
           {
-            action: "drop",
-            regex: "POD",
-            sourceLabels: [
-              "container"
-            ]
+            action: "labelmap",
+            regex: "container_name",
+            replacement: "container"
           },
           {
             action: "drop",
             regex: "POD",
             sourceLabels: [
-              "container_name"
+              "container"
             ]
           },
           {
@@ -92,7 +90,7 @@
             regex: "kubelet;.+;(?:container_cpu_load_average_10s|container_cpu_system_seconds_total|container_cpu_usage_seconds_total|container_cpu_cfs_throttled_seconds_total|container_memory_usage_bytes|container_memory_swap|container_memory_working_set_bytes|container_spec_memory_limit_bytes|container_spec_memory_swap_limit_bytes|container_spec_memory_reservation_limit_bytes|container_spec_cpu_quota|container_spec_cpu_period|container_fs_usage_bytes|container_fs_limit_bytes|container_fs_reads_bytes_total|container_fs_writes_bytes_total|)",
             sourceLabels: [
               "job",
-              "container_name",
+              "container",
               "__name__"
             ]
           }