diff --git a/node-daemon/pvcd.sample.yaml b/node-daemon/pvcd.sample.yaml
index 66469105..c1d589d7 100644
--- a/node-daemon/pvcd.sample.yaml
+++ b/node-daemon/pvcd.sample.yaml
@@ -78,16 +78,16 @@ pvc:
         pass: pvcdns
   # system: Local PVC instance configuration
   system:
+    # intervals: Intervals for keepalives and fencing
+    intervals:
+      # keepalive_interval: Number of seconds between keepalive/status updates
+      keepalive_interval: 5
+      # fence_intervals: Number of keepalive_intervals to declare a node dead and fence it
+      fence_intervals: 6
+      # suicide_intervals: Numer of keepalive_intervals before a node considers itself dead and self-fences, 0 to disable 
+      suicide_intervals: 0
     # fencing: Node fencing configuration
     fencing:
-      # intervals: Intervals for fencing determination
-      intervals:
-        # keepalive_interval: Number of seconds between keepalive/status updates
-        keepalive_interval: 5
-        # fence_intervals: Number of keepalive_intervals to declare a node dead and fence it
-        fence_intervals: 6
-        # suicide_intervals: Numer of keepalive_intervals before a node considers itself dead and self-fences, 0 to disable 
-        suicide_intervals: 0
       # actions: Actions to take after a fence trigger
       actions:
         # successful_fence: Action to take after successfully fencing a node, options: migrate, None
diff --git a/node-daemon/pvcd/Daemon.py b/node-daemon/pvcd/Daemon.py
index 366525b6..095c526f 100644
--- a/node-daemon/pvcd/Daemon.py
+++ b/node-daemon/pvcd/Daemon.py
@@ -149,9 +149,9 @@ def readConfig(pvcd_config_file, myhostname):
             'log_keepalive_cluster_details': o_config['pvc']['system']['configuration']['logging']['log_keepalive_cluster_details'],
             'log_keepalive_storage_details': o_config['pvc']['system']['configuration']['logging']['log_keepalive_storage_details'],
             'console_log_lines': o_config['pvc']['system']['configuration']['logging']['console_log_lines'],
-            'keepalive_interval': o_config['pvc']['system']['fencing']['intervals']['keepalive_interval'],
-            'fence_intervals': o_config['pvc']['system']['fencing']['intervals']['fence_intervals'],
-            'suicide_intervals': o_config['pvc']['system']['fencing']['intervals']['suicide_intervals'],
+            'keepalive_interval': o_config['pvc']['system']['intervals']['keepalive_interval'],
+            'fence_intervals': o_config['pvc']['system']['intervals']['fence_intervals'],
+            'suicide_intervals': o_config['pvc']['system']['intervals']['suicide_intervals'],
             'successful_fence': o_config['pvc']['system']['fencing']['actions']['successful_fence'],
             'failed_fence': o_config['pvc']['system']['fencing']['actions']['failed_fence'],
             'migration_target_selector': o_config['pvc']['system']['migration']['target_selector'],