diff --git a/{{cookiecutter.project_slug}}/docker-compose.override.example.yml b/{{cookiecutter.project_slug}}/docker-compose.override.example.yml
index 1a2d4ea..5578186 100644
--- a/{{cookiecutter.project_slug}}/docker-compose.override.example.yml
+++ b/{{cookiecutter.project_slug}}/docker-compose.override.example.yml
@@ -21,7 +21,7 @@
 #   frontend:
 #     ports:
 #       - 127.0.0.1:3000:3000
-#   mailhog:
+#   mailpit:
 #     ports:
 #       - 127.0.0.1:8025:8025
 
@@ -78,16 +78,16 @@
 #     build:
 #       args:
 #         <<: *x-build-args
-#   mailhog:
+#   mailpit:
 #     networks:
 #       - default
 #       - pontsun
 #     labels:
 #       - 'traefik.enable=true'
-#       - 'traefik.http.routers.{{ cookiecutter.project_slug }}_mailhog.entrypoints=http,https'
-#       - 'traefik.http.routers.{{ cookiecutter.project_slug }}_mailhog.middlewares=https_redirect@file'
-#       - 'traefik.http.routers.{{ cookiecutter.project_slug }}_mailhog.rule=Host(`{{ subdomain }}-mail.docker.test`)'
-#       - 'traefik.http.services.{{ cookiecutter.project_slug }}_mailhog.loadbalancer.server.port=8025'
+#       - 'traefik.http.routers.{{ cookiecutter.project_slug }}_mailpit.entrypoints=http,https'
+#       - 'traefik.http.routers.{{ cookiecutter.project_slug }}_mailpit.middlewares=https_redirect@file'
+#       - 'traefik.http.routers.{{ cookiecutter.project_slug }}_mailpit.rule=Host(`{{ subdomain }}-mail.docker.test`)'
+#       - 'traefik.http.services.{{ cookiecutter.project_slug }}_mailpit.loadbalancer.server.port=8025'
 #
 # networks:
 #   pontsun:
diff --git a/{{cookiecutter.project_slug}}/docker-compose.yml b/{{cookiecutter.project_slug}}/docker-compose.yml
index 0620f98..85f568d 100644
--- a/{{cookiecutter.project_slug}}/docker-compose.yml
+++ b/{{cookiecutter.project_slug}}/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       ALLOWED_HOSTS: >-
         localhost
       DATABASE_URL: postgresql://postgres:{{ cookiecutter.project_slug }}@db.{{ cookiecutter.__network_name }}/{{ cookiecutter.project_slug }}
-      EMAIL_URL: smtp://mailhog.{{ cookiecutter.__network_name }}:1025
+      EMAIL_URL: smtp://mailpit.{{ cookiecutter.__network_name }}:1025
       MEDIA_ROOT: /opt/media
     volumes:
       - media:/opt/media
@@ -41,9 +41,8 @@ services:
       - .:/code
     environment:
       <<: *x-environment
-  mailhog:
-    image: mailhog/mailhog:v1.0.1
-
+  mailpit:
+    image: axllent/mailpit:latest
 networks:
   default:
     name: {{ cookiecutter.__network_name }}