diff --git a/nix/os/devices/srv0.home-ch.stefanjunker.de/system.nix b/nix/os/devices/srv0.home-ch.stefanjunker.de/system.nix
index e171c4a..c5f54f4 100644
--- a/nix/os/devices/srv0.home-ch.stefanjunker.de/system.nix
+++ b/nix/os/devices/srv0.home-ch.stefanjunker.de/system.nix
@@ -57,6 +57,14 @@ in {
   networking.useHostResolvConf = true;
 
   containers = {
+    mailserver = import ../../containers/mailserver.nix {
+      hostAddress = "192.168.100.10";
+      localAddress = "192.168.100.11";
+
+      imapsPort = 993;
+      sievePort = 4190;
+    };
+
     webserver = import ../../containers/webserver.nix {
       hostAddress = "192.168.100.12";
       localAddress = "192.168.100.13";
@@ -77,6 +85,7 @@ in {
       hostAddress = "192.168.100.16";
       localAddress = "192.168.100.17";
       subvolumes = [
+        "mailserver"
         "webserver"
         "backup"
         "syncthing"
diff --git a/nix/os/devices/vmd32387.contaboserver.net/system.nix b/nix/os/devices/vmd32387.contaboserver.net/system.nix
index c25022a..a29e3a7 100644
--- a/nix/os/devices/vmd32387.contaboserver.net/system.nix
+++ b/nix/os/devices/vmd32387.contaboserver.net/system.nix
@@ -106,20 +106,11 @@ in {
   networking.useHostResolvConf = true;
 
   containers = {
-    mailserver = import ../../containers/mailserver.nix {
-      hostAddress = "192.168.100.10";
-      localAddress = "192.168.100.11";
-
-      imapsPort = 993;
-      sievePort = 4190;
-    };
-
     backup = import ../../containers/backup.nix {
       inherit config;
       hostAddress = "192.168.100.16";
       localAddress = "192.168.100.17";
       subvolumes = [
-        "mailserver"
         "backup"
       ];
     };