diff --git a/src/hwmon.rs b/src/hwmon.rs
index 5044a66..568f28e 100644
--- a/src/hwmon.rs
+++ b/src/hwmon.rs
@@ -69,7 +69,9 @@ impl ChimemonSource for HwmonSource {
                     builder = builder.tag(key, value)
                 }
                 builder = builder
-                    .tag("sensor", &s.name)
+                    .tag("name", &s.name)
+                    .tag("sensor", &s.sensor)
+                    .tag("device", &s.device)
                     .field("value", sensor_val.trim().parse::<i64>().unwrap());
                 builder.build().unwrap()
             });