diff --git a/hosts/defiant/filesystems.nix b/hosts/defiant/filesystems.nix
index e355fe1..4081db1 100644
--- a/hosts/defiant/filesystems.nix
+++ b/hosts/defiant/filesystems.nix
@@ -3,7 +3,11 @@
   # Boot drives are defined in ./hardware-configuration.nix
 
   boot = {
-    zfs.extraPools = [ "tank" ];
+    zfs = {
+      extraPools = [ "tank" ];
+      forceImportRoot = false;
+    };
+
     supportedFilesystems = [ "zfs" ];
   };
   services.prometheus.exporters.zfs.enable = true;
diff --git a/hosts/defiant/libvirt.nix b/hosts/defiant/libvirt.nix
index d69d1ce..e4e3474 100644
--- a/hosts/defiant/libvirt.nix
+++ b/hosts/defiant/libvirt.nix
@@ -11,6 +11,7 @@
   fileSystems."/var/lib/libvirt/images" = {
     device = "/tank/iso";
     options = [ "bind" ];
+    fsType = "auto";
   };
 
   # On a gui-enabled machine, connect with:
diff --git a/hosts/defiant/services/monitoring/grafana.nix b/hosts/defiant/services/monitoring/grafana.nix
index 6c61b0c..cb8d5cd 100644
--- a/hosts/defiant/services/monitoring/grafana.nix
+++ b/hosts/defiant/services/monitoring/grafana.nix
@@ -9,10 +9,15 @@ in {
 
     # TODO: Migrate sqlite to postgres
 
-    settings.server = {
-      domain = "grafana.home.feal.no";
-      http_port = 2342;
-      http_addr = "127.0.0.1";
+    settings = {
+      server = {
+        domain = "grafana.home.feal.no";
+        http_port = 2342;
+        http_addr = "127.0.0.1";
+      };
+      security = {
+        secret_key = "SW2YcwTIb9zpOOhoPsMm"; # TODO - Rotate
+      };
     };
 
     provision = {
diff --git a/hosts/defiant/services/monitoring/snmp-exporter.nix b/hosts/defiant/services/monitoring/snmp-exporter.nix
index e68ae2f..7b20e65 100644
--- a/hosts/defiant/services/monitoring/snmp-exporter.nix
+++ b/hosts/defiant/services/monitoring/snmp-exporter.nix
@@ -1,12 +1,13 @@
 { config, pkgs, ... }:
 
 {
-  services.prometheus.exporters.snmp = {
-    enable = true;
-    configurationPath = ./snmp-exporter-conf.yml;
-    # snmp.yml is built from
-    # https://github.com/prometheus/snmp_exporter/blob/main/snmp.yml
-    # and
-    # https://global.download.synology.com/download/Document/Software/DeveloperGuide/Firmware/DSM/All/enu/Synology_DiskStation_MIB_Guide.pdf
-  };
+  # TODO - Fix. Broken in 26.05
+  # services.prometheus.exporters.snmp = {
+  #   enable = true;
+  #   configurationPath = ./snmp-exporter-conf.yml;
+  #   # snmp.yml is built from
+  #   # https://github.com/prometheus/snmp_exporter/blob/main/snmp.yml
+  #   # and
+  #   # https://global.download.synology.com/download/Document/Software/DeveloperGuide/Firmware/DSM/All/enu/Synology_DiskStation_MIB_Guide.pdf
+  # };
 }
diff --git a/hosts/defiant/services/pihole.nix b/hosts/defiant/services/pihole.nix
index 66a6ca2..21a0ad7 100644
--- a/hosts/defiant/services/pihole.nix
+++ b/hosts/defiant/services/pihole.nix
@@ -4,7 +4,7 @@ let
   dnsHost = "192.168.10.175";
   webuiListen = "127.0.1.2:5053";
 in {
-  # Flame - Homelab dashboard/linktree
+  # Pihole - Ad-blocking DNS recursor and authoritative DNS/DHCP
   virtualisation.oci-containers.containers = {
     pihole = {
       image = "pihole/pihole";