diff --git a/assets/web/apache2_mailpit.conf b/assets/web/apache2_mailpit.conf
index fa4716f6837..c2658b83afd 100644
--- a/assets/web/apache2_mailpit.conf
+++ b/assets/web/apache2_mailpit.conf
@@ -12,8 +12,8 @@
 
 Redirect "/_/mail" "/_/mail/"
 
-ProxyPass "/_/mail/api/events" "ws://mailpit:8025/api/events"
-ProxyPassReverse "/_/mail/api/events" "ws://mailpit:8025/api/events"
+ProxyPass "/_/mail/api/events" "ws://mailpit:8025/_/mail/api/events"
+ProxyPassReverse "/_/mail/api/events" "ws://mailpit:8025/_/mail/api/events"
 
-ProxyPass "/_/mail/" "http://mailpit:8025/"
-ProxyPassReverse "/_/mail/" "http://mailpit:8025/"
+ProxyPass "/_/mail/" "http://mailpit:8025/_/mail/"
+ProxyPassReverse "/_/mail/" "http://mailpit:8025/_/mail/"
diff --git a/service.mail.yml b/service.mail.yml
index b56ba183e7a..5b91ddd1431 100644
--- a/service.mail.yml
+++ b/service.mail.yml
@@ -6,4 +6,6 @@ services:
     depends_on:
       - mailpit
   mailpit:
-    image: axllent/mailpit
+    image: axllent/mailpit:v1.10
+    environment:
+      MP_WEBROOT: /_/mail/