diff --git a/inventory/group_vars/all/vars.yml b/inventory/group_vars/all/vars.yml
index 163734e..c478a87 100644
--- a/inventory/group_vars/all/vars.yml
+++ b/inventory/group_vars/all/vars.yml
@@ -11,6 +11,12 @@ ansible_become_password: "{{ vault_ansible_become_password }}"
 system_base_ssh_user: "{{ vault_system_base_ssh_user }}"
 system_base_ntp_timezone: "{{ vault_system_base_ntp_timezone }}"
 
+# --------------------------------------------------------------------------------------------------
+# system:extra
+# --------------------------------------------------------------------------------------------------
+system_extra_netdata_stream_parent: false
+system_extra_netdata_stream_api_key: "{{ vault_system_extra_netdata_stream_api_key }}"
+
 # --------------------------------------------------------------------------------------------------
 # system:mail
 # --------------------------------------------------------------------------------------------------
diff --git a/inventory/group_vars/asgard/vars.yml b/inventory/group_vars/asgard/vars.yml
index d8572ee..8ee6099 100644
--- a/inventory/group_vars/asgard/vars.yml
+++ b/inventory/group_vars/asgard/vars.yml
@@ -6,14 +6,6 @@ system_etc_home_directory: "{{ system_etc_root_directory }}/services"
 system_var_data_directory: "{{ system_var_root_directory }}/data"
 system_var_containers_directory: "{{ system_var_root_directory }}/containers"
 
-# --------------------------------------------------------------------------------------------------
-# system:extra
-# --------------------------------------------------------------------------------------------------
-system_extra_netdata_bind_to: "localhost"
-system_extra_netdata_stream_parent: false
-system_extra_netdata_stream_dest_inet6: "{{ hostvars.yggdrasil.vpn_wireguard_inet6_address }}"
-system_extra_netdata_stream_api_key: "{{ vault_system_extra_netdata_stream_api_key }}"
-
 # --------------------------------------------------------------------------------------------------
 # vpn:wireguard
 # --------------------------------------------------------------------------------------------------
diff --git a/inventory/host_vars/heimdall/vars.yml b/inventory/host_vars/heimdall/vars.yml
index f4ce76a..47c9606 100644
--- a/inventory/host_vars/heimdall/vars.yml
+++ b/inventory/host_vars/heimdall/vars.yml
@@ -11,6 +11,12 @@ system_base_udp_ports:
   - 546                         # dhcpv6
   - "{{ vpn_wireguard_port }}"
 
+# --------------------------------------------------------------------------------------------------
+# system:extra
+# --------------------------------------------------------------------------------------------------
+system_extra_netdata_update_every: "15"
+system_extra_netdata_stream_dest_inet6: "2001:1c00:161e:7900::5"
+
 # --------------------------------------------------------------------------------------------------
 # vpn:wireguard
 # --------------------------------------------------------------------------------------------------
diff --git a/inventory/host_vars/valkyrie/vars.yml b/inventory/host_vars/valkyrie/vars.yml
index cfffa32..c5b8b16 100644
--- a/inventory/host_vars/valkyrie/vars.yml
+++ b/inventory/host_vars/valkyrie/vars.yml
@@ -1,4 +1,10 @@
 ---
+# --------------------------------------------------------------------------------------------------
+# system:extra
+# --------------------------------------------------------------------------------------------------
+system_extra_netdata_update_every: "5"
+system_extra_netdata_stream_dest_inet6: "{{ hostvars.yggdrasil.vpn_wireguard_inet6_address }}"
+
 # --------------------------------------------------------------------------------------------------
 # system:mail
 # --------------------------------------------------------------------------------------------------
diff --git a/playbooks/system.yml b/playbooks/system.yml
index 252677a..1b38489 100644
--- a/playbooks/system.yml
+++ b/playbooks/system.yml
@@ -100,6 +100,12 @@
         - "system:base:user"
       vars:
         system_base_user_become_user: "{{ system_base_ssh_user }}"
+    - role: "system/extra/netdata"
+      tags:
+        - "system:extra"
+        - "system:extra:netdata"
+      vars:
+        system_extra_netdata_install_sensors: "{{ 'home' in group_names }}"
 
 - name: "system : yggdrasil"
   hosts: "yggdrasil"
@@ -112,21 +118,6 @@
         system_extra_libvirt_user_name: "{{ system_base_ssh_user }}"
         system_extra_libvirt_install_zfs_driver: "{{ 'zfs' in group_names }}"
 
-- name: "system : valkyrie, yggdrasil"
-  hosts:
-    - "valkyrie"
-    - "yggdrasil"
-  roles:
-    - role: "system/extra/netdata"
-      tags:
-        - "system:extra"
-        - "system:extra:netdata"
-      vars:
-        system_extra_netdata_registry_inet_address: "\
-          {{ hostvars.yggdrasil.system_extra_netdata_inet_address }}"
-        system_extra_netdata_registry_inet6_address: "\
-          {{ hostvars.yggdrasil.system_extra_netdata_inet6_address }}"
-
 - name: "system : asgard:&zfs"
   hosts: "asgard:&zfs"
   roles:
diff --git a/roles b/roles
index ffe6503..34a250b 160000
--- a/roles
+++ b/roles
@@ -1 +1 @@
-Subproject commit ffe65032db646abf9ddb500dcefdea887e45ce6e
+Subproject commit 34a250bd4288f0f6686bb581add334c11570c523