diff --git a/coolify/.env.example b/coolify/.env.example
index 3864a85..c484c4d 100644
--- a/coolify/.env.example
+++ b/coolify/.env.example
@@ -5,3 +5,4 @@ APP_KEY=change_me
 PUSHER_APP_ID=change_me
 PUSHER_APP_KEY=change_me
 PUSHER_APP_SECRET=change_me
+MAIL_FROM_ADDRESS=noreply@coolify.example.com
diff --git a/coolify/compose.yml b/coolify/compose.yml
index ec79d2e..ddcdc45 100644
--- a/coolify/compose.yml
+++ b/coolify/compose.yml
@@ -23,6 +23,12 @@ services:
       PUSHER_APP_SECRET: ${PUSHER_APP_SECRET}
       PUSHER_SCHEME: https
       SSL_MODE: "off"
+      MAIL_MAILER: smtp
+      MAIL_HOST: mailpit
+      MAIL_PORT: 1025
+      MAIL_ENCRYPTION: ""
+      MAIL_FROM_ADDRESS: ${MAIL_FROM_ADDRESS:-noreply@coolify.example.com}
+      MAIL_FROM_NAME: Coolify
     volumes:
       - ../.data/coolify/data:/data/coolify
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/mailpit/compose.yml b/mailpit/compose.yml
index 2bfbcd4..3ba59d7 100644
--- a/mailpit/compose.yml
+++ b/mailpit/compose.yml
@@ -14,10 +14,24 @@ services:
       MP_SMTP_RELAY_PASSWORD: ${SMTP_RELAY_PASSWORD}
       MP_SMTP_RELAY_AUTH: plain
       MP_SMTP_RELAY_TLS: "true"
-      MP_UI_BIND_ADDR: 0.0.0.0:0
+      MP_UI_BIND_ADDR: 0.0.0.0:8025
     volumes:
       - ../.data/mailpit:/data
     restart: always
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.middlewares.mailpit-redirect-web-secure.redirectscheme.scheme=https"
+      - "traefik.http.routers.mailpit-web.middlewares=mailpit-redirect-web-secure"
+      - "traefik.http.routers.mailpit-web.rule=Host(`${TRAEFIK_HOST}`)"
+      - "traefik.http.routers.mailpit-web.entrypoints=web"
+      - "traefik.http.routers.mailpit-web.service=mailpit"
+      - "traefik.http.routers.mailpit-web-secure.rule=Host(`${TRAEFIK_HOST}`)"
+      - "traefik.http.routers.mailpit-web-secure.tls.certresolver=resolver"
+      - "traefik.http.routers.mailpit-web-secure.entrypoints=web-secure"
+      - "traefik.http.routers.mailpit-web-secure.middlewares=security-headers@file,no-index@file"
+      - "traefik.http.routers.mailpit-web-secure.service=mailpit"
+      - "traefik.http.services.mailpit.loadbalancer.server.port=8025"
+      - "traefik.docker.network=${NETWORK_NAME}"
     networks:
       - compose_network
 networks: