diff --git a/magpie/configuration.nix b/magpie/configuration.nix
index e77c752..4e86515 100644
--- a/magpie/configuration.nix
+++ b/magpie/configuration.nix
@@ -89,12 +89,13 @@
 
   mailserver = {
     enable = true;
-    debug = false;
+    debug.all = false;
     fqdn = "mail.project-cloud.net";
     domains = [ "project-cloud.net" ];
     enableSubmissionSsl = true;
     enableImap = false;
     enableImapSsl = true;
+    stateVersion = 3;
 
     # A list of all login accounts. To create the password hashes, use
     # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
@@ -121,7 +122,11 @@
       port = 22;
     }
   ];
-  services.opendkim.enable = true;
+
+  services.opendkim = {
+    enable = true;
+    selector = "mail";
+  };
 
   services.miniflux = {
     enable = false;