diff --git a/acme.nix b/acme.nix
index 9eef03e..bb736e5 100644
--- a/acme.nix
+++ b/acme.nix
@@ -2,7 +2,7 @@
 
 {
   security.acme.acceptTerms = true;
-  security.acme.email = "kontakt@hamburg.freifunk.net";
+  security.acme.defaults.email = "kontakt@hamburg.freifunk.net";
   users.groups.certs = {
     members = [ "dovecot2" "nginx" "postfix" ];
   };
diff --git a/configuration.nix b/configuration.nix
index 543710f..30e9926 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -56,7 +56,7 @@
   system.autoUpgrade.enable = true;
   system.autoUpgrade.allowReboot = true;
   nix = {
-    autoOptimiseStore = true;
+    settings.auto-optimise-store = true;
     gc.automatic = true;
     gc.options = "--delete-older-than 14d";
   };
@@ -94,8 +94,10 @@
   services.openssh = {
     enable = true;
     # Only allow login through pubkey
-    passwordAuthentication = false;
-    challengeResponseAuthentication = false;
+    settings = {
+      PasswordAuthentication = false;
+    };
+    kbdInteractiveAuthentication = false;
     extraConfig = "PubkeyAcceptedAlgorithms +ssh-rsa";
   };
   # Support mosh connections
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 1a9fd74..496c27b 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -33,5 +33,5 @@
     [ { device = "/dev/disk/by-partuuid/f1251a25-02"; randomEncryption.enable = true; }
     ];
 
-  nix.maxJobs = lib.mkDefault 1;
+  nix.settings.max-jobs = lib.mkDefault 1;
 }