diff --git a/hosts/tomate/configuration.nix b/hosts/tomate/configuration.nix
index 7ac0b3a..8058b04 100644
--- a/hosts/tomate/configuration.nix
+++ b/hosts/tomate/configuration.nix
@@ -50,13 +50,13 @@
   services.xserver.enable = true;
 
   # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
+  services.displayManager.sddm.enable = true;
   services.xserver.desktopManager.plasma5.enable = true;
 
   # Configure keymap in X11
   services.xserver = {
-    layout = "de";
-    xkbVariant = "";
+    xkb.layout = "de";
+    xkb.variant = "";
   };
 
   # Configure console keymap
@@ -90,7 +90,7 @@
 
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
     openFirewall = true;
     publish = {
       enable = true;
diff --git a/modules/mail/dovecot2.nix b/modules/mail/dovecot2.nix
index ffc6614..df29df0 100644
--- a/modules/mail/dovecot2.nix
+++ b/modules/mail/dovecot2.nix
@@ -101,7 +101,7 @@ in
     # set to satisfy the sieveScripts check, will be overridden by userdb lookups anyways
     mailUser = "vmail";
     mailGroup = "vmail";
-    sieveScripts = {
+    sieve.scripts = {
       before = pkgs.writeText "spam.sieve" ''
         require "fileinto";
 
diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix
index 6ab4a25..6e515d1 100644
--- a/modules/nextcloud.nix
+++ b/modules/nextcloud.nix
@@ -30,7 +30,7 @@ in
       database.createLocally = true;
 
       # enable HEIC image preview
-      extraOptions.enabledPreviewProviders = [
+      settings.enabledPreviewProviders = [
         "OC\\Preview\\BMP"
         "OC\\Preview\\GIF"
         "OC\\Preview\\JPEG"