diff --git a/hbd/server/config.py b/hbd/server/config.py
index 7bb3d2e..d6edea6 100644
--- a/hbd/server/config.py
+++ b/hbd/server/config.py
@@ -79,9 +79,13 @@ THRESHOLD_DEFAULTS = {
                 }
             },
             'memory_monitor': {
-                'percent': {
+                'memory_percent': {
                     'warning': 85.0,
                     'critical': 95.0
+                },
+                'swap_percent': {
+                    'warning': 40.0,
+                    'critical': 75.0
                 }
             },
             'disk_monitor': {
@@ -109,11 +113,15 @@ THRESHOLD_DEFAULTS = {
                 'pools': {
                     '*': {
                         'status': {
-                            'warning': 1,  
-                            'critical': 2,  
+                            'warning': 1,
+                            'critical': 2,
                             'operator': '>',
                             'hysteresis': 0.0,
                             'display': 'ZFS pool {pool_name} is {health}'
+                        },
+                        'capacity': {
+                            'warning': 80.0,
+                            'critical': 90.0,
                         }
                     }
                 }