diff --git a/public/svgs/mailpit.svg b/public/svgs/mailpit.svg
new file mode 100644
index 000000000..e569e71cc
--- /dev/null
+++ b/public/svgs/mailpit.svg
@@ -0,0 +1,5 @@
+<svg width="500" height="460" viewBox="0 0 132.292 121.708" version="1.1" id="svg6" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <defs id="defs10"/>
+  <path d="M12.321 0l53.861 53.918L120.365 0zM5.155 9.025l60.842 59.673 61.211-59.489-.185 36.835L66.921 70.54l15.164 12.616-8.137 5.986-41.609.184c-4.838-.022-25.877-18.34-27.185-41.255z" fill-opacity=".941" fill="#2d4a5f" id="path2" style="fill:#ffffff;fill-opacity:1"/>
+  <path d="M78.385 72.049l53.907-21.679-8.031 57.318-11.845-9.132c-21.727 23.171-45.255 26.289-67.997 20.837S12.281 98.39 5.155 83.8-.67 53.116 2.843 38.769c1.13 10.511-1.313 16.316 6.38 33.612 6.31 11.399 14.413 20.417 25.89 24.956 13.9 6.195 32.247 3.357 41.701-3.039l14.24-12.156z" fill="#00b786" id="path4"/>
+<script xmlns=""/></svg>
diff --git a/templates/compose/mailpit.yaml b/templates/compose/mailpit.yaml
new file mode 100644
index 000000000..46072fb21
--- /dev/null
+++ b/templates/compose/mailpit.yaml
@@ -0,0 +1,20 @@
+# documentation: https://mailpit.axllent.org/docs/
+# slogan: Email & SMTP testing tool with API for developers
+# tags: mailpit,email,testing,smtp
+# logo: svgs/mailpit.png
+# port: 8025
+
+services:
+  mailpit:
+    image: axllent/mailpit
+    container_name: mailpit
+    volumes:
+      - "mailpit-data:/data"
+    ports:
+      - "1025:1025"
+    environment:
+      - SERVICE_FQDN_MAILPIT_8025
+      - MP_MAX_MESSAGES: 5000
+      - MP_DATABASE: /data/mailpit.db
+      - MP_SMTP_AUTH_ACCEPT_ANY: 1
+      - MP_SMTP_AUTH_ALLOW_INSECURE: 1