diff --git a/Cargo.lock b/Cargo.lock
index 55c91fe..c009d05 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.116"
+version = "0.1.117"
 dependencies = [
  "anyhow",
  "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.116"
+version = "0.1.117"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -324,7 +324,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.116"
+version = "0.1.117"
 dependencies = [
  "chrono",
  "serde",
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
index c20ccd0..ca37396 100644
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.116"
+version = "0.1.117"
 edition = "2021"
 
 [dependencies]
diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml
index 0b67635..bd55909 100644
--- a/dashboard/Cargo.toml
+++ b/dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.116"
+version = "0.1.117"
 edition = "2021"
 
 [dependencies]
diff --git a/dashboard/src/ui/widgets/system.rs b/dashboard/src/ui/widgets/system.rs
index b95d38d..8eea131 100644
--- a/dashboard/src/ui/widgets/system.rs
+++ b/dashboard/src/ui/widgets/system.rs
@@ -185,11 +185,13 @@ impl SystemWidget {
                             pool.usage_percent = Some(usage);
                             pool.status = metric.status.clone();
                         }
-                    } else if metric.name.contains("_used_gb") {
+                    } else if metric.name.contains("_used_gb") && !metric.name.contains("_fs_") {
+                        // Only use drive-level metrics for pool totals, not filesystem metrics
                         if let MetricValue::Float(used) = metric.value {
                             pool.used_gb = Some(used);
                         }
-                    } else if metric.name.contains("_total_gb") {
+                    } else if metric.name.contains("_total_gb") && !metric.name.contains("_fs_") {
+                        // Only use drive-level metrics for pool totals, not filesystem metrics  
                         if let MetricValue::Float(total) = metric.value {
                             pool.total_gb = Some(total);
                         }
@@ -391,10 +393,9 @@ impl SystemWidget {
                 
                 for suffix in known_suffixes {
                     if after_fs.ends_with(suffix) {
-                        // Safely calculate fs_name length
-                        let suffix_with_underscore = suffix.len() + 1;
-                        if after_fs.len() > suffix_with_underscore {
-                            let fs_name = after_fs[..after_fs.len() - suffix_with_underscore].to_string();
+                        // Extract filesystem name by removing suffix and underscore
+                        if let Some(underscore_pos) = after_fs.rfind(&format!("_{}", suffix)) {
+                            let fs_name = after_fs[..underscore_pos].to_string();
                             return (Some(fs_name), Some(suffix.to_string()));
                         }
                     }
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index 829a56d..8c46436 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.116"
+version = "0.1.117"
 edition = "2021"
 
 [dependencies]