diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix
index 0ac4d9f..42bb7dc 100644
--- a/systems/x86_64-linux/aspi/default.nix
+++ b/systems/x86_64-linux/aspi/default.nix
@@ -95,6 +95,15 @@
 
   virtualisation.docker.enable = true;
 
+  # Do not alway generate man-cache, making builds much faster
+  documentation.man.generateCaches = false;
+
+  # MDNS on local network
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+  };
+
   # Packages needed as root
   environment.systemPackages = with pkgs; [
     vim