diff --git a/dashboard/src/ui/mod.rs b/dashboard/src/ui/mod.rs
index 0943467..5053475 100644
--- a/dashboard/src/ui/mod.rs
+++ b/dashboard/src/ui/mod.rs
@@ -119,7 +119,7 @@ impl TuiApp {
                 // Add NixOS metrics
                 let nixos_metrics: Vec<&Metric> = all_metrics
                     .iter()
-                    .filter(|m| m.name.starts_with("system_nixos") || m.name.starts_with("system_active"))
+                    .filter(|m| m.name == "system_nixos_build" || m.name == "system_active_users")
                     .copied()
                     .collect();
                 system_metrics.extend(nixos_metrics);
diff --git a/dashboard/src/ui/widgets/system.rs b/dashboard/src/ui/widgets/system.rs
index de48b76..f86a125 100644
--- a/dashboard/src/ui/widgets/system.rs
+++ b/dashboard/src/ui/widgets/system.rs
@@ -297,6 +297,10 @@ impl Widget for SystemWidget {
         self.has_data = !metrics.is_empty();
 
         for metric in metrics {
+            // Debug logging for NixOS metrics
+            if metric.name.starts_with("system_") {
+                tracing::debug!("SystemWidget received metric: {} = {:?}", metric.name, metric.value);
+            }
             match metric.name.as_str() {
                 // NixOS metrics
                 "system_nixos_build" => {