diff --git a/machines/core-services-01/monitoring.nix b/machines/core-services-01/monitoring.nix
index 2a8ac5f..edf0d20 100644
--- a/machines/core-services-01/monitoring.nix
+++ b/machines/core-services-01/monitoring.nix
@@ -37,17 +37,19 @@ in
   services.netdata = {
     enable = true;
     package = pkgs.netdata.overrideAttrs (old: {
-      version = "1.35.0-nightly";
+      version = "1.36.0-185-nightly";
       src = pkgs.fetchFromGitHub {
         owner = "netdata";
         repo = "netdata";
-        rev = "955d1a7c61f4eab802648d563f84d978ebeb8fc4";
-        sha256 = "sha256-gN44Df+k384NummsHls2JY1CinBaFK3cpdmmdZMbA44=";
+        rev = "284d5450ec938b667db9985aca6d3cd02b96487f";
+        sha256 = "sha256-QRZL1RjspiqpR1cq8TDqY0wDc4ct7BDY0vbddsvlHgc=";
         fetchSubmodules = true;
       };
     });
   };
 
+  systemd.services.netdata.environment."NETDATA_DISABLE_CLOUD" = "1";
+
   # Allow WireGuard VPN
   networking.firewall.allowedUDPPorts = [ 51820 ];
   # Allow access to the raw netdata
@@ -71,12 +73,6 @@ in
     ];
   };
 
-  systemd.services.netdata.restartTriggers = map (v: config.environment.etc."netdata/${v}.conf".source) [
-    "netdata"
-    "stream"
-    "health_alarm_notify"
-  ];
-
   environment.etc."netdata/netdata.conf" = lib.mkForce {
     user = "netdata";
     group = "netdata";
@@ -122,7 +118,7 @@ in
     mode = "0600";
     text = ''
       # External tools
-      nc="${pkgs.netcat}/bin/nc"
+      nc="${pkgs.nmap}/bin/nc --ssl"
 
       # IRC configuration
       SEND_IRC="YES"