diff --git a/docker/conf/vault.yml b/docker/conf/vault.yml
--- a/docker/conf/vault.yml
+++ b/docker/conf/vault.yml
@@ -11,3 +11,6 @@
   cls: pathslicing
   root: /srv/softwareheritage/vault
   slicing: 0:5
+smtp:
+  port: 1025
+  host: mailhog
diff --git a/docker/docker-compose.keycloak.yml b/docker/docker-compose.keycloak.yml
--- a/docker/docker-compose.keycloak.yml
+++ b/docker/docker-compose.keycloak.yml
@@ -2,12 +2,6 @@
 
 services:
 
-  mailhog:
-    image: mailhog/mailhog
-    ports:
-      - "1025:1025"
-      - "8025:8025"
-
   keycloak-db:
     image: postgres:11
     env_file:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -95,6 +95,12 @@
       - "./conf/grafana/provisioning:/etc/grafana/provisioning:ro"
       - "./conf/grafana/dashboards:/var/lib/grafana/dashboards"
 
+  mailhog:
+    image: mailhog/mailhog
+    ports:
+      - "1025:1025"
+      - "8025:8025"
+
   nginx:
     image: nginx
     volumes: