diff --git a/README.md b/README.md
index 592e312..0a766c0 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ An development apps environment for Nextcloud.
 Run the command:
 
 ```bash
-docker compose up nextcloud mysql nginx mailhog redis
+docker compose up nextcloud mysql nginx mailpit redis
 ```
 
 * [Advanced setup](docs/advanced-setup.md)
diff --git a/docker-compose.yml b/docker-compose.yml
index 7281d4d..d3ca14a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -53,7 +53,7 @@ services:
       - MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS:-nextcloud}
       - MAIL_DOMAIN=${MAIL_DOMAIN:-nextcloud.test}
       - MAIL_SMTPPORT=${MAIL_SMTPPORT:-1025}
-      - MAIL_SMTPHOST=${MAIL_SMTPHOST:-mailhog}
+      - MAIL_SMTPHOST=${MAIL_SMTPHOST:-mailpit}
       - VERSION_NEXTCLOUD=${VERSION_NEXTCLOUD:-master}
       - AUTOINSTALL=${AUTOINSTALL:-1}
       - XDEBUG_CONFIG
@@ -69,8 +69,8 @@ services:
       - ./volumes/nginx/includes:/etc/nginx/conf.d/includes/
     ports:
       - 127.0.0.1:${HTTP_PORT:-80}:80
-  mailhog:
-    image: blueimp/mailhog
+  mailpit:
+    image: axllent/mailpit
     ports:
       - 127.0.0.1:${MAILHOG_PORT:-8025}:8025
   redis:
diff --git a/docs/bash_aliases.md b/docs/bash_aliases.md
index cc9a492..0680b17 100644
--- a/docs/bash_aliases.md
+++ b/docs/bash_aliases.md
@@ -25,8 +25,8 @@ source ~/.bashrc
 
 ```bash
 alias occ='docker compose exec -u www-data nextcloud occ'
-alias nextcloud-mysql='docker compose up nextcloud mysql nginx mailhog redis'
-alias nextcloud-pgsql='docker compose up nextcloud pgsql nginx mailhog redis'
+alias nextcloud-mysql='docker compose up nextcloud mysql nginx mailpit redis'
+alias nextcloud-pgsql='docker compose up nextcloud pgsql nginx mailpit redis'
 ```
 
 ⬅️ [Back to index](../README.md)