diff --git a/docker-compose.yml b/docker-compose.yml
index 9053530..6fd8a41 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,8 +9,8 @@ services:
   redis:
     image: redis:5
 
-  mailcatcher:
-    image: sj26/mailcatcher:latest
+  maildev:
+    image: maildev/maildev:latest
     ports:
       - "1081:1080"
 
@@ -38,7 +38,7 @@ services:
     depends_on:
         - dimail
         - postgresql
-        - mailcatcher
+        - maildev
         - redis
   
   celery-dev:
diff --git a/env.d/development/common.dist b/env.d/development/common.dist
index e57dc0f..8e9ff71 100644
--- a/env.d/development/common.dist
+++ b/env.d/development/common.dist
@@ -10,7 +10,7 @@ PYTHONPATH=/app
 # People settings
 
 # Mail
-DJANGO_EMAIL_HOST="mailcatcher"
+DJANGO_EMAIL_HOST="maildev"
 DJANGO_EMAIL_PORT=1025
 
 # Backend url