diff --git a/hosts/franz/default.nix b/hosts/franz/default.nix
index 68ec74c..8723834 100644
--- a/hosts/franz/default.nix
+++ b/hosts/franz/default.nix
@@ -33,8 +33,11 @@ in {
   networking.hostId = "f014fc43";
   services.zfs.autoScrub.enable = true;
 
+  # Prevent server from getting stuck in emergency mode and non-connectable via SSH
   systemd.enableEmergencyMode = false;
-  networking.firewall.enable = true;
+
+  # Fix rebuild being stuck when Pihole is down due to docker restart
+  systemd.services.NetworkManager-wait-online.enable = false;
 
   # Prevent zfs from being automounted by fstab auto discovery & zfs
   fileSystems."/storage/dataset".options = ["noauto"];