diff --git a/mastus/mail.nix b/mastus/mail.nix
index 915f27c..2db62d0 100644
--- a/mastus/mail.nix
+++ b/mastus/mail.nix
@@ -38,7 +38,7 @@
     mailLocation = "maildir:~/mail";
     sslCACert = "/etc/sslcerts/startssl.cert";
     sslServerCert = "/etc/sslcerts/mail.cert";
-    sslServerKey = "/etc/sslcerts/mail.key";
+    sslServerKey = "/etc/sslcerts/mail-dovecot.key";
   };
 
   services.spamassassin.enable = true;
diff --git a/mastus/vmtest.nix b/mastus/vmtest.nix
index 147eb8d..fd96600 100644
--- a/mastus/vmtest.nix
+++ b/mastus/vmtest.nix
@@ -52,8 +52,8 @@ KEY_CN=mail.gebner.org pkitool --server mail
 
 cp keys/ca.crt startssl.cert
 cp keys/mail.crt mail.cert
-cp keys/mail.key mail-postfix.key
-cp keys/mail.key mail-dovecot.key
+cp keys/mail.key mail.key
+cp keys/mail.key mail-dovecot.key && chown dovecot2 mail-dovecot.key
 cp keys/git.crt git.cert
 cp keys/git.key mastus.key