diff --git a/charts/nut-exporter/Chart.yaml b/charts/nut-exporter/Chart.yaml
index 5a4bc4a9753d579548d3f533e40e231646577f4a..2972fae4e1354850a95a9a3d9a7de0f81b0b0a16 100644
--- a/charts/nut-exporter/Chart.yaml
+++ b/charts/nut-exporter/Chart.yaml
@@ -13,5 +13,5 @@ sources:
   - https://github.com/acolombier/nut_exporter/tree/feat/add-helm-chart
 
 type: application
-version: 0.3.3
+version: 0.3.4
 appVersion: 3.0.0
diff --git a/charts/nut-exporter/README.md b/charts/nut-exporter/README.md
index ccdd0f011232d2ae706d81274c71869c9c0fd88f..b7bf285d7afc6b01f74009f5cb6c958e635ffd69 100644
--- a/charts/nut-exporter/README.md
+++ b/charts/nut-exporter/README.md
@@ -1,6 +1,6 @@
 # nut-exporter
 
-![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
 
 Installs NUT exporter in Kubernetes
 
@@ -21,7 +21,7 @@ Installs NUT exporter in Kubernetes
 | image.repository | string | `"ghcr.io/druggeri/nut_exporter"` |  |
 | image.tag | string | `""` |  |
 | nodeSelector | object | `{}` |  |
-| podMonitor | object | `{"enabled":true,"labels":{},"params":{},"relabelings":[]}` | Enables podMonitor object for prometheus-operator based setups |
+| podMonitor | object | `{"enabled":true,"labels":{},"params":{},"relabelings":[{"source_labels":["__param_ups"],"target_label":"ups"}]}` | Enables podMonitor object for prometheus-operator based setups |
 | podMonitor.params | object | `{}` | parameters that are used on the scrape target required for functional dashboard |
 | podSecurityContext.runAsGroup | int | `3642` |  |
 | podSecurityContext.runAsNonRoot | bool | `true` |  |
diff --git a/charts/nut-exporter/dashboards/default.json b/charts/nut-exporter/dashboards/default.json
index 54a2abc899c9a9239b10d40a7c3771955f643631..5d9b12034a3daad591a58cc0ed6b5d0edf5ff0c3 100755
--- a/charts/nut-exporter/dashboards/default.json
+++ b/charts/nut-exporter/dashboards/default.json
@@ -145,7 +145,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_ups_status == 1",
+          "expr": "max by (ups, flag) (network_ups_tools_ups_status) == 1",
           "interval": "",
           "legendFormat": "{{flag}}",
           "refId": "A"
@@ -211,7 +211,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_device_info{ups=\"$ups\"}",
+          "expr": "max by (ups, model, mfr, serial) (network_ups_tools_device_info{ups=\"$ups\"})",
           "interval": "",
           "legendFormat": "{{mfr}}",
           "refId": "A"
@@ -277,7 +277,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_device_info{ups=\"$ups\"}",
+          "expr": "max by (ups, model, mfr, serial) (network_ups_tools_device_info{ups=\"$ups\"})",
           "interval": "",
           "legendFormat": "{{model}}",
           "refId": "A"
@@ -351,7 +351,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_battery_charge{ups=\"$ups\"}",
+          "expr": "min by (ups) (network_ups_tools_battery_charge{ups=\"$ups\")}",
           "instant": false,
           "interval": "",
           "legendFormat": "",
@@ -431,7 +431,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_battery_runtime{ups=\"$ups\"}",
+          "expr": "min by (ups) (network_ups_tools_battery_runtime{ups=\"$ups\")}",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -540,7 +540,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_ups_load{ups=\"$ups\"}",
+          "expr": "max by (ups) (network_ups_tools_ups_load{ups=\"$ups\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -635,7 +635,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_battery_runtime{ups=\"$ups\"}",
+          "expr": "min by (ups) (network_ups_tools_battery_runtime{ups=\"$ups\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -710,7 +710,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_input_voltage{ups=\"$ups\"}",
+          "expr": "avg by (ups) (network_ups_tools_input_voltage{ups=\"$ups\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -771,7 +771,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_input_voltage{ups=\"$ups\"}",
+          "expr": "avg by (ups) (network_ups_tools_input_voltage{ups=\"$ups\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -888,7 +888,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_battery_voltage{ups=\"$ups\"}",
+          "expr": "min by (ups) (network_ups_tools_battery_voltage{ups=\"$ups\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -949,7 +949,7 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "expr": "network_ups_tools_battery_voltage{ups=\"$ups\"}",
+          "expr": "min by (ups) (network_ups_tools_battery_voltage{ups=\"$ups\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
diff --git a/charts/nut-exporter/templates/podmonitor.yaml b/charts/nut-exporter/templates/podmonitor.yaml
index a20f344703b60ae899f60125ab7c5b241cbee7b0..537d71d980d0d5b6a275b7b5c866793f6d8b71f6 100644
--- a/charts/nut-exporter/templates/podmonitor.yaml
+++ b/charts/nut-exporter/templates/podmonitor.yaml
@@ -26,6 +26,7 @@ spec:
       params:
         {{ toYaml . | nindent 8}}
       {{- end }}
+      {{- with .Values.podMonitor.metricLabels }}
   jobLabel: nut-exporter
   namespaceSelector:
     matchNames:
diff --git a/charts/nut-exporter/values.yaml b/charts/nut-exporter/values.yaml
index 9f7c3729b6a6876a40985cb73ecb2c94a16e2dd1..ca99461cc80f62d2b7a45e00c358b95b727e8e74 100644
--- a/charts/nut-exporter/values.yaml
+++ b/charts/nut-exporter/values.yaml
@@ -13,9 +13,9 @@ dashboard:
 podMonitor:
   enabled: true
   labels: {}
-  relabelings: []
-    # - replacement: "My UPS"
-    #   targetLabel: ups
+  relabelings:
+    - source_labels: [__param_ups]
+      target_label: ups
   # -- parameters that are used on the scrape target required for functional dashboard
   params: {}
     # ups: