diff --git a/.env b/.env
index 0ad7b53cac..8d1815ee07 100644
--- a/.env
+++ b/.env
@@ -49,6 +49,7 @@ SERVER_NAME=phraseanet-docker
 
 # Mysql max allowed packet
 MYSQL_MAX_ALLOWED_PACKET=16M
+COMPOSE_FILE=docker-compose.yml:docker-compose.db.yml:docker-compose.mailhog.yml
 
 # --------------- PHRASEANET CONFIGURATION --------------------
 
diff --git a/docker-compose.db.yml b/docker-compose.db.yml
new file mode 100644
index 0000000000..c558e331a1
--- /dev/null
+++ b/docker-compose.db.yml
@@ -0,0 +1,12 @@
+version: "3.4"
+
+services: 
+  db:
+    image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-db:$PHRASEANET_DOCKER_TAG
+    build: ./docker/db
+    restart: on-failure
+    environment:
+    - MYSQL_ROOT_PASSWORD
+    - MYSQL_MAX_ALLOWED_PACKET
+    volumes:
+    - ${PHRASEANET_DB_DIR}:/var/lib/mysql
\ No newline at end of file
diff --git a/docker-compose.mailhog.yml b/docker-compose.mailhog.yml
new file mode 100644
index 0000000000..5d96c408b4
--- /dev/null
+++ b/docker-compose.mailhog.yml
@@ -0,0 +1,8 @@
+version: "3.4"
+
+services:
+  mailhog:
+    image: mailhog/mailhog
+    ports:
+    - 1025:1025
+    - 8025:8025
\ No newline at end of file