diff --git a/docker/images/docker-compose.yaml b/docker/images/docker-compose.yaml
index 6274e3b2a5..304d572194 100644
--- a/docker/images/docker-compose.yaml
+++ b/docker/images/docker-compose.yaml
@@ -51,6 +51,7 @@ networks:
 volumes:
   penpot_postgres_v15:
   penpot_assets:
+  # penpot_mailpit_data:
   # penpot_traefik:
 
 services:
@@ -165,14 +166,14 @@ services:
       PENPOT_TELEMETRY_ENABLED: "true"
       PENPOT_TELEMETRY_REFERER: compose
 
-      ## Example SMTP/Email configuration. By default, emails are sent to the mailcatch
+      ## Example SMTP/Email configuration. By default, emails are sent to the Mailpit
       ## service, but for production usage it is recommended to setup a real SMTP
       ## provider. Emails are used to confirm user registrations & invitations. Look below
-      ## how the mailcatch service is configured.
+      ## how the Mailpit service is configured.
 
       PENPOT_SMTP_DEFAULT_FROM: no-reply@example.com
       PENPOT_SMTP_DEFAULT_REPLY_TO: no-reply@example.com
-      PENPOT_SMTP_HOST: penpot-mailcatch
+      PENPOT_SMTP_HOST: penpot-mailpit
       PENPOT_SMTP_PORT: 1025
       PENPOT_SMTP_USERNAME:
       PENPOT_SMTP_PASSWORD:
@@ -258,16 +259,22 @@ services:
       # although this should not be necessary.
       - VALKEY_EXTRA_FLAGS=--maxmemory 128mb --maxmemory-policy volatile-lfu
 
-  ## A mailcatch service, used as temporal SMTP server. You can access via HTTP to the
-  ## port 1080 for read all emails the penpot platform has sent. Should be only used as a
-  ## temporal solution while no real SMTP provider is configured.
+  ## A Mailpit service, used as temporal SMTP server. You can access via HTTP to the
+  ## port 8025 to read all emails the penpot platform has sent. Should be only used as a
+  ## temporal solution while no real SMTP provider is configured. Messages are kept in
+  ## memory only and are lost when the container is recreated; uncomment the volume
+  ## below (and the one in the top-level volumes: section) to persist them instead.
 
-  penpot-mailcatch:
-    image: sj26/mailcatcher:latest
+  penpot-mailpit:
+    image: axllent/mailpit:v1
     restart: always
+    # volumes:
+    #   - penpot_mailpit_data:/data
+    # environment:
+    #   - MP_DATABASE=/data/mailpit.db
     expose:
       - '1025'
     ports:
-      - "1080:1080"
+      - "8025:8025"
     networks:
       - penpot