diff --git a/bundles/netdata/files/netdata.conf b/bundles/netdata/files/netdata.conf
deleted file mode 100644
index 4c2e985..0000000
--- a/bundles/netdata/files/netdata.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-[global]
-    run as user = netdata
-    hostname = ${node.name}
-    memory mode = save
-    history = 86400
-
-[web]
-    web files owner = root
-    web files group = root
-    bind to = 0.0.0.0
-
-[registry]
-    enabled = no
-
-[health]
-    enabled = no
diff --git a/bundles/netdata/items.py b/bundles/netdata/items.py
deleted file mode 100644
index f8a5d40..0000000
--- a/bundles/netdata/items.py
+++ /dev/null
@@ -1,17 +0,0 @@
-files = {
-    '/etc/netdata/netdata.conf': {
-        'content_type': 'mako',
-        'triggers': {
-            'svc_systemd:netdata:restart',
-        }
-    },
-}
-
-svc_systemd = {
-    'netdata': {
-        'needs': {
-            'pkg_apt:netdata',
-            'file:/etc/netdata/netdata.conf',
-        },
-    },
-}
diff --git a/bundles/netdata/metadata.py b/bundles/netdata/metadata.py
deleted file mode 100644
index feb00ff..0000000
--- a/bundles/netdata/metadata.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from bundlewrap.metadata import atomic
-
-defaults = {
-    'apt': {
-        'packages': {
-            'netdata': {},
-        },
-    },
-    'icinga2_api': {
-        'netdata': {
-            'services': {
-                'NETDATA PROCESS': {
-                    'command_on_monitored_host': '/usr/lib/nagios/plugins/check_procs -C netdata -c 1:',
-                },
-            },
-        },
-    },
-}
-
-
-@metadata_reactor.provides(
-    'firewall/port_rules/19999',
-)
-def firewall(metadata):
-    return {
-        'firewall': {
-            'port_rules': {
-                '19999': atomic(metadata.get('netdata/restrict-to', set())),
-            },
-        },
-    }
diff --git a/bundles/unbound/files/netdata-unbound.yaml b/bundles/unbound/files/netdata-unbound.yaml
deleted file mode 100644
index 128a20c..0000000
--- a/bundles/unbound/files/netdata-unbound.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-jobs:
-  - name: local
-    address: 127.0.0.1:8953
-    timeout: 1
-    conf_path: /etc/unbound/unbound.conf
-    cumulative_stats: no
-    use_tls: yes
-    tls_skip_verify: no
-    tls_cert: /etc/unbound/unbound_control.pem
-    tls_key: /etc/unbound/unbound_control.key
diff --git a/bundles/unbound/files/unbound.conf b/bundles/unbound/files/unbound.conf
index ef0cbf8..31188c9 100644
--- a/bundles/unbound/files/unbound.conf
+++ b/bundles/unbound/files/unbound.conf
@@ -41,7 +41,7 @@ server:
     tls-cert-bundle: "/etc/ssl/certs/ca-certificates.crt"
 
 remote-control:
-% if node.has_bundle('netdata') or node.has_bundle('telegraf'):
+% if node.has_bundle('telegraf'):
     control-enable: yes
 % else:
     control-enable: no
diff --git a/bundles/unbound/items.py b/bundles/unbound/items.py
index c3bb352..fdd1a18 100644
--- a/bundles/unbound/items.py
+++ b/bundles/unbound/items.py
@@ -43,14 +43,6 @@ if node.has_bundle('systemd-networkd'):
         'file:/etc/resolv.conf',
     }
 
-if node.has_bundle('netdata'):
-    files['/etc/netdata/go.d/unbound.conf'] = {
-        'source': 'netdata-unbound.yaml',
-        'triggers': {
-            'svc_systemd:netdata:restart',
-        },
-    }
-
 if node.has_bundle('pppd'):
     files['/etc/systemd/system/unbound.service.d/bundlewrap.conf'] = {
         'source': 'override.conf',
diff --git a/nodes/home/downloadhelper.py b/nodes/home/downloadhelper.py
index 3037ca2..56a3b7d 100644
--- a/nodes/home/downloadhelper.py
+++ b/nodes/home/downloadhelper.py
@@ -1,7 +1,6 @@
 nodes['home.downloadhelper'] = {
     'hostname': '172.19.138.27',
     'bundles': {
-        'netdata',
         'nfs-client',
         'transmission',
     },
@@ -34,11 +33,6 @@ nodes['home.downloadhelper'] = {
                 'enp1s0.42',
             },
         },
-        'netdata': {
-            'restrict-to': {
-                '172.19.136.0/22',
-            },
-        },
         'nfs-client': {
             'mounts': {
                 'storage': {
diff --git a/nodes/home/nas.py b/nodes/home/nas.py
index 007b9cf..730f385 100644
--- a/nodes/home/nas.py
+++ b/nodes/home/nas.py
@@ -6,7 +6,6 @@ nodes['home.nas'] = {
         'backup-server',
         'lm-sensors',
         'mosquitto',
-        'netdata',
         'nfs-server',
         'scansnap',
         'smartd',
@@ -110,12 +109,6 @@ nodes['home.nas'] = {
                 '172.19.138.0/24',
             },
         },
-        'netdata': {
-            'restrict-to': {
-                '172.19.136.0/25',
-                '172.19.138.0/24',
-            },
-        },
         'nfs-server': {
             'shares': {
                 '/storage/download': {
diff --git a/nodes/home/router.py b/nodes/home/router.py
index 052c678..e0b7a2d 100644
--- a/nodes/home/router.py
+++ b/nodes/home/router.py
@@ -2,7 +2,6 @@ nodes['home.router'] = {
     'hostname': '172.19.138.1',
     'bundles': {
         'dhcpd',
-        'netdata',
         'nginx',
         'openvpn-client',
         'pppd',
@@ -116,12 +115,6 @@ nodes['home.router'] = {
                 ],
             },
         },
-        'netdata': {
-            'restrict-to': {
-                '172.19.136.0/25',
-                '172.19.138.0/24',
-            },
-        },
         'nginx': {
             'restrict-to': {
                 '172.19.136.0/25',