diff --git a/dev/config.yml b/dev/config.yml
index ef9c234c3..78e76ee55 100644
--- a/dev/config.yml
+++ b/dev/config.yml
@@ -9,6 +9,10 @@ database:
 rabbitmq:
   host: rabbitmq
 
+email:
+  host: mailpit
+  port: 1025
+
 playout:
   liquidsoap_host: liquidsoap
 
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index d6d33d62b..3be135b6d 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -81,3 +81,9 @@ services:
     volumes:
       - ./dev/certs:/certs
       - ./dev/icecast.xml:/etc/icecast.xml
+
+  mailpit:
+    image: axllent/mailpit
+    ports:
+      - 8025:8025
+      - 1025:1025