diff --git a/modules/nixos/services/homeprinter/default.nix b/modules/nixos/services/homeprinter/default.nix
index c5ab726..09fbaa5 100644
--- a/modules/nixos/services/homeprinter/default.nix
+++ b/modules/nixos/services/homeprinter/default.nix
@@ -16,16 +16,6 @@ in
       gutenprint
     ];
 
-    services.avahi = {
-      enable = true;
-      nssmdns4 = true;
-      nssmdns6 = true;
-      ipv6 = true;
-      ipv4 = true;
-    };
-
-    networking.firewall.allowedUDPPorts = [ 5353 ];
-
     hardware.printers.ensurePrinters = [
       {
         name = "Brother_DCP-L2530DW_series";
diff --git a/systems/x86_64-linux/mx/nextcloud.nix b/systems/x86_64-linux/mx/nextcloud.nix
index 7fc68f4..d5c9012 100644
--- a/systems/x86_64-linux/mx/nextcloud.nix
+++ b/systems/x86_64-linux/mx/nextcloud.nix
@@ -16,23 +16,6 @@
       mail_smtpmode = "sendmail";
       mail_sendmailmode = "pipe";
       default_phone_region = "DE";
-      enabledPreviewProviders = [
-        "OC\\Preview\\BMP"
-        "OC\\Preview\\GIF"
-        "OC\\Preview\\HEIC"
-        "OC\\Preview\\JPEG"
-        "OC\\Preview\\Krita"
-        "OC\\Preview\\MP3"
-        "OC\\Preview\\MP4"
-        "OC\\Preview\\MarkDown"
-        "OC\\Preview\\Movie"
-        "OC\\Preview\\OpenDocument"
-        "OC\\Preview\\PDF"
-        "OC\\Preview\\PNG"
-        "OC\\Preview\\TXT"
-        "OC\\Preview\\WEBP"
-        "OC\\Preview\\XBitmap"
-      ];
     };
     phpOptions = {
       upload_max_filesize = lib.mkForce "1G";
@@ -44,6 +27,23 @@
     config.dbname = "nextcloud";
     config.dbhost = "/run/postgresql";
     config.dbuser = "nextcloud";
+    extraOptions.enabledPreviewProviders = [
+      "OC\\Preview\\BMP"
+      "OC\\Preview\\GIF"
+      "OC\\Preview\\HEIC"
+      "OC\\Preview\\JPEG"
+      "OC\\Preview\\Krita"
+      "OC\\Preview\\MP3"
+      "OC\\Preview\\MP4"
+      "OC\\Preview\\MarkDown"
+      "OC\\Preview\\Movie"
+      "OC\\Preview\\OpenDocument"
+      "OC\\Preview\\PDF"
+      "OC\\Preview\\PNG"
+      "OC\\Preview\\TXT"
+      "OC\\Preview\\WEBP"
+      "OC\\Preview\\XBitmap"
+    ];
   };
 
   services.postgresql = {
diff --git a/systems/x86_64-linux/sgx/fileserver.nix b/systems/x86_64-linux/sgx/fileserver.nix
index 3a1ae2f..e05672c 100644
--- a/systems/x86_64-linux/sgx/fileserver.nix
+++ b/systems/x86_64-linux/sgx/fileserver.nix
@@ -20,10 +20,7 @@
 
   services.avahi = {
     enable = true;
-    nssmdns4 = true;
-    nssmdns6 = true;
-    ipv6 = true;
-    ipv4 = true;
+    nssmdns = true;
     publish = {
       enable = true;
       userServices = true;