diff --git a/inventory/group_vars/asgard/vars.yml b/inventory/group_vars/asgard/vars.yml
index b3fe2b2..d8572ee 100644
--- a/inventory/group_vars/asgard/vars.yml
+++ b/inventory/group_vars/asgard/vars.yml
@@ -9,10 +9,9 @@ system_var_containers_directory: "{{ system_var_root_directory }}/containers"
 # --------------------------------------------------------------------------------------------------
 # system:extra
 # --------------------------------------------------------------------------------------------------
-system_extra_netdata_inet_address: "{{ vpn_bridge_inet_address }}"
-system_extra_netdata_inet6_address: "{{ vpn_bridge_inet6_address }}"
-system_extra_netdata_registry_enabled: false
-system_extra_netdata_registry_url: "{{ vault_system_extra_netdata_registry_url }}"
+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 }}"
 
 # --------------------------------------------------------------------------------------------------
diff --git a/inventory/host_vars/valkyrie/vars.yml b/inventory/host_vars/valkyrie/vars.yml
index 63e259c..cfffa32 100644
--- a/inventory/host_vars/valkyrie/vars.yml
+++ b/inventory/host_vars/valkyrie/vars.yml
@@ -10,8 +10,6 @@ system_mail_smtp_pass: "{{ vault_system_mail_smtp_pass }}"
 system_base_udp_ports:
   - 546                         # dhcpv6
   - "{{ vpn_wireguard_port }}"
-system_base_additional_tcp_ports:
-  - 19999                       # netdata
 
 # --------------------------------------------------------------------------------------------------
 # system:var
diff --git a/inventory/host_vars/yggdrasil/vars.yml b/inventory/host_vars/yggdrasil/vars.yml
index 2728a79..4da1d2d 100644
--- a/inventory/host_vars/yggdrasil/vars.yml
+++ b/inventory/host_vars/yggdrasil/vars.yml
@@ -2,7 +2,8 @@
 # --------------------------------------------------------------------------------------------------
 # system:extra
 # --------------------------------------------------------------------------------------------------
-system_extra_netdata_registry_enabled: true
+system_extra_netdata_bind_to: "0.0.0.0 [::]"
+system_extra_netdata_stream_parent: true
 
 # --------------------------------------------------------------------------------------------------
 # system:zfs
@@ -37,6 +38,8 @@ system_base_additional_tcp_ports:
   - 139                         # samba
   - 445                         # samba
   - 19999                       # netdata
+system_base_forward_to_localhost:
+  - 19999                       # netdata
 system_base_unattended_upgrades_blacklist:
   - "linux-"
   - "zfs(utils)?-"
@@ -144,7 +147,7 @@ services_host_services:
   lrproxy:
     inet_address: "{{ vpn_bridge_inet_prefix }}.2"
     inet6_address: "{{ vpn_bridge_inet6_prefix }}::2"
-    tcp: [80, 443, 19999]
+    tcp: [80, 443]
     restic: true
   database:
     inet_address: "{{ vpn_bridge_inet_prefix }}.3"
diff --git a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/netdata.valkyrie.thenineworlds.net.conf b/playbooks/files/services/deploy/lrproxy/nginx-conf.d/netdata.valkyrie.thenineworlds.net.conf
deleted file mode 100644
index d4f4d0b..0000000
--- a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/netdata.valkyrie.thenineworlds.net.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-server {
-    listen [::]:19999;
-    listen 19999;
-    server_name netdata.valkyrie.thenineworlds.net;
-
-    allow {{ local_inet_network }};
-    allow {{ local_inet6_network }};
-    deny  all;
-
-    location / {
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $remote_addr;
-        proxy_set_header Host $host;
-        proxy_pass http://netdata.valkyrie.thenineworlds.net:19999;
-    }
-
-    error_page 500 502 503 504 /50x.html;
-    location = /50x.html {
-        root /usr/share/nginx/html;
-    }
-
-}
diff --git a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/netdata.yggdrasil.thenineworlds.net.conf b/playbooks/files/services/deploy/lrproxy/nginx-conf.d/netdata.yggdrasil.thenineworlds.net.conf
deleted file mode 100644
index 0be8f03..0000000
--- a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/netdata.yggdrasil.thenineworlds.net.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-server {
-    listen [::]:19999;
-    listen 19999;
-    server_name netdata.yggdrasil.thenineworlds.net;
-
-    allow {{ local_inet_network }};
-    allow {{ local_inet6_network }};
-    deny  all;
-
-    location / {
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $remote_addr;
-        proxy_set_header Host $host;
-        proxy_pass http://netdata.yggdrasil.thenineworlds.net:19999;
-    }
-
-    error_page 500 502 503 504 /50x.html;
-    location = /50x.html {
-        root /usr/share/nginx/html;
-    }
-
-}
diff --git a/playbooks/roles/services/deploy/rproxy/templates/hosts b/playbooks/roles/services/deploy/rproxy/templates/hosts
index b4c8181..75511c8 100644
--- a/playbooks/roles/services/deploy/rproxy/templates/hosts
+++ b/playbooks/roles/services/deploy/rproxy/templates/hosts
@@ -4,11 +4,6 @@ ff02::1         ip6-allnodes
 ff02::2         ip6-allrouters
 
 127.0.1.1       {{ services_service_name }}
-{% for netdata_host in ( services_deploy_netdata_hosts | dict2items ) %}
-
-{{ netdata_host.value.inet6_address }} {{ netdata_host.key }}
-{{ netdata_host.value.inet_address }} {{ netdata_host.key }}
-{% endfor %}
 {% for service in ( services_all_services | dict2items ) %}
 
 {{ service.value.inet6_address }} pod-{{ service.key }}
diff --git a/playbooks/services.yml b/playbooks/services.yml
index 37894fa..23e66a3 100644
--- a/playbooks/services.yml
+++ b/playbooks/services.yml
@@ -92,17 +92,8 @@
           - "files/services/deploy/lrproxy/nginx-conf.d/database.thenineworlds.net.conf"
           - "files/services/deploy/lrproxy/nginx-conf.d/git.thenineworlds.net.conf"
           - "files/services/deploy/lrproxy/nginx-conf.d/music.thenineworlds.net.conf"
-          - "files/services/deploy/lrproxy/nginx-conf.d/netdata.valkyrie.thenineworlds.net.conf"
-          - "files/services/deploy/lrproxy/nginx-conf.d/netdata.yggdrasil.thenineworlds.net.conf"
           - "files/services/deploy/lrproxy/nginx-conf.d/notes.thenineworlds.net.conf"
         services_service_deploy_versions: "{{ services_deploy_versions.lrproxy }}"
-        services_deploy_netdata_hosts:
-          "netdata.valkyrie.thenineworlds.net":
-            inet_address: "{{ hostvars.valkyrie.system_extra_netdata_inet_address }}"
-            inet6_address: "{{ hostvars.valkyrie.system_extra_netdata_inet6_address }}"
-          "netdata.yggdrasil.thenineworlds.net":
-            inet_address: "{{ hostvars.yggdrasil.system_extra_netdata_inet_address }}"
-            inet6_address: "{{ hostvars.yggdrasil.system_extra_netdata_inet6_address }}"
       when: "'lrproxy' in services_host_services"
       tags: "always"
 
diff --git a/roles b/roles
index 0f80516..f92b5ea 160000
--- a/roles
+++ b/roles
@@ -1 +1 @@
-Subproject commit 0f805168b6c3b6293378e75e061a8b6dbbf1f875
+Subproject commit f92b5eac6ed0965a3189500e2bfa3b01c77da21c