diff --git a/projects/mailserver/compose.yaml.mako b/projects/mailserver/compose.yaml.mako
new file mode 100644
index 0000000..f6b0be8
--- /dev/null
+++ b/projects/mailserver/compose.yaml.mako
@@ -0,0 +1,18 @@
+services:  
+  mailserver:
+    container_name: mailserver
+    image: docker.io/stalwartlabs/mail-server:v0.10.2
+    network_mode: pasta:-a,${env['pasta']['mailserver']['ipv4']},-a,${env['pasta']['mailserver']['ipv6']}
+    restart: always
+    user: "${env['users']['mailserver']}:${env['users']['mailserver']}"
+    cap_add:
+      - NET_BIND_SERVICE
+    ports:
+      - "${env['ports']['mailserver_smtp']}:25"
+      - ${env['ports']['mailserver_smtps']}:465
+      - ${env['ports']['mailserver_imaps']}:993
+      - ${env['ports']['mailserver_https']}:443
+    volumes:
+      - ${env['certs']['mailserver']['cert']}:/etc/fullchain.pem:ro
+      - ${env['certs']['mailserver']['pkey']}:/etc/privkey.pem:ro
+      - ${env['volumes']['mailserver']['datadir']}:/opt/stalwart-mail
diff --git a/pyenv.yml b/pyenv.yml
index 58c2ce4..f32bfd3 100644
--- a/pyenv.yml
+++ b/pyenv.yml
@@ -25,6 +25,8 @@ backup:
     - /mnt/etebasedata/media
   hedgedoc:
     - /mnt/hedgedocuploads
+  mailserver:
+    - /mnt/mailserver/etc/config.toml
   synapse:
     - /mnt/synapsedata
   vaultwarden:
@@ -58,6 +60,9 @@ pasta:
   hedgedoc:
     ipv4: 10.86.8.1
     ipv6: fc86::8
+  mailserver:
+    ipv4: 10.86.13.1
+    ipv6: fc86::13
   synapse:
     ipv4: 10.86.19.1
     ipv6: fc86::19