diff --git a/README.md b/README.md
index 3883f61..3b89a95 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ Not every stack is tested to fully work.
 | Gitea                   | ✅            | `gitea/gitea`                                | Lightweight Git hosting platfom.                               | [Website](https://gitea.io/), [Github](https://github.com/go-gitea/gitea)                                                                                                                                                   |
 | Homer                   | ✅            | `b4bz/homer`                                 | Server homepage generator.                                     | [Github](https://github.com/bastienwirtz/homer), [Demo](https://homer-demo.netlify.app), [Configuration](https://github.com/bastienwirtz/homer/blob/main/docs/configuration.md)                                             |
 | I2PD                    | ✅            | `purplei2p/i2pd`                             | The Invisible Internet router.                                 | [Website](https://i2pd.website), [Github](https://github.com/PurpleI2P/i2pd/), [I2P project](https://geti2p.net/)                                                                                                           |
+| InBucket                | ✅            | `inbucket/inbucket`                          | Testing SMTP/POP3 mail server with web interface.              | [Website](https://www.inbucket.org), [Github](https://github.com/inbucket/inbucket)                                                                                                                                   |
 | ~~JDownloader~~         | ✅ Abandoned  | `jaymoulin/jdownloader`                      | Download manager with paid/ad file hosting support.            | [Website](https://jdownloader.org)                                                                                                                                                                                          |
 | ~~Joplin~~              | ✅ Abandoned  | `joplin/server`                              | Markdown GTD / notes manager synchronization server.           | [Website](https://joplinapp.org), [Github](https://github.com/laurent22/joplin)                                                                                                                                             |
 | Lidarr                  | Not tested   | `linuxserver/lidarr`                         | Music downloader and manager.                                  | [Website](https://lidarr.audio), [Github](https://github.com/Lidarr/Lidarr), [Wiki](https://wiki.servarr.com/lidarr)                                                                                                        |
diff --git a/inbucket/.env.dist b/inbucket/.env.dist
new file mode 100644
index 0000000..bed4ffa
--- /dev/null
+++ b/inbucket/.env.dist
@@ -0,0 +1,26 @@
+HOST_SMTP_ADDR=0.0.0.0
+HOST_SMTP_PORT=2500
+HOST_POP3_ADDR=0.0.0.0
+HOST_POP3_PORT=1100
+HOST_HTTP_ADDR=0.0.0.0
+HOST_HTTP_PORT=8389
+
+# https://github.com/inbucket/inbucket/blob/main/doc/config.md
+INBUCKET_STORAGE_TYPE=memory
+INBUCKET_STORAGE_RETENTIONPERIOD=24h
+INBUCKET_STORAGE_MAILBOXMSGCAP=500
+
+INBUCKET_WEB_MONITORVISIBLE=true
+INBUCKET_WEB_MONITORHISTORY=30
+
+INBUCKET_POP3_DOMAIN=inbucket
+INBUCKET_SMTP_DOMAIN=inbucket
+#INBUCKET_SMTP_ACCEPTDOMAINS=
+#INBUCKET_SMTP_REJECTDOMAINS=
+INBUCKET_SMTP_DEFAULTSTORE=true
+#INBUCKET_SMTP_STOREDOMAINS=
+#INBUCKET_SMTP_DISCARDDOMAINS=
+# Use local or full addressing
+INBUCKET_MAILBOXNAMING=local
+# debug, info, warn, or error
+INBUCKET_LOGLEVEL=warn
diff --git a/inbucket/data/.gitignore b/inbucket/data/.gitignore
new file mode 100644
index 0000000..c96a04f
--- /dev/null
+++ b/inbucket/data/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/inbucket/docker-compose.yml b/inbucket/docker-compose.yml
new file mode 100644
index 0000000..d33dfcc
--- /dev/null
+++ b/inbucket/docker-compose.yml
@@ -0,0 +1,13 @@
+services:
+  inbucket:
+    image: inbucket/inbucket:latest
+    container_name: inbucket
+    ports:
+      - "${HOST_HTTP_PORT:-0.0.0.0}:${HOST_HTTP_PORT:-8389}:9000/tcp"
+      - "${HOST_SMTP_ADDR:-0.0.0.0}:${HOST_SMTP_PORT:-8389}:2500/tcp"
+      - "${HOST_HTTP_ADDR:-0.0.0.0}:${HOST_POP3_PORT:-8389}:1100/tcp"
+    volumes:
+      # Not used by default, you need to configure storage parameters to store on disk.
+      - ./data:/data/
+    env_file: .env
+    restart: unless-stopped