diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md
index 318226c1..ffbe22dc 100644
--- a/DOCUMENTATION/content/introduction/index.md
+++ b/DOCUMENTATION/content/introduction/index.md
@@ -138,6 +138,7 @@ That's it! enjoy :)
 
 - **Mail Servers:**
     - Mailu 
+    - Mailcatcher
     - Mailhog 
     - MailDev
 
@@ -181,6 +182,7 @@ That's it! enjoy :)
          - `Wordpress CLI`
     - Apache ZooKeeper *(Centralized service for distributed systems to a hierarchical key-value store)*
     - Kibana *(Visualize your Elasticsearch data and navigate the Elastic Stack)*
+    - Dejavu *(Edit your Elasticsearch data)*
     - LogStash *(Server-side data processing pipeline that ingests data from a multitude of sources simultaneously)*
     - Jenkins *(automation server, that provides plugins to support building, deploying and automating any project)*
     - Certbot *(Automatically enable HTTPS on your website)*
diff --git a/dejavu/Dockerfile b/dejavu/Dockerfile
new file mode 100644
index 00000000..3effeeb9
--- /dev/null
+++ b/dejavu/Dockerfile
@@ -0,0 +1,5 @@
+FROM appbaseio/dejavu
+
+LABEL maintainer="appbase.io <info@appbase.io>"
+
+EXPOSE 1358
diff --git a/docker-compose.yml b/docker-compose.yml
index 3477b26c..f29edbe6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -910,6 +910,18 @@ services:
         - frontend
         - backend
 
+### Dejavu ##############################################
+    dejavu:
+      build:
+        context: ./dejavu
+      ports:
+        - "${DEJAVU_HTTP_PORT}:1358"
+      depends_on:
+        - elasticsearch
+      networks:
+        - frontend
+        - backend
+
 ### Certbot #########################################
     certbot:
       build:
@@ -923,6 +935,16 @@ services:
       networks:
         - frontend
 
+### Mailcatcher ################################################
+    mailcatcher:
+      build: ./mailcatcher
+      ports:
+        - "1025:1025"
+        - "1080:1080"
+      networks:
+        - frontend
+        - backend
+
 ### Mailhog ################################################
     mailhog:
       build: ./mailhog
diff --git a/env-example b/env-example
index 831f4206..94026caa 100644
--- a/env-example
+++ b/env-example
@@ -392,6 +392,10 @@ ELASTICSEARCH_HOST_TRANSPORT_PORT=9300
 
 KIBANA_HTTP_PORT=5601
 
+### DEJAVU ################################################
+
+DEJAVU_HTTP_PORT=1358
+
 ### MEMCACHED #############################################
 
 MEMCACHED_HOST_PORT=11211
diff --git a/mailcatcher/Dockerfile b/mailcatcher/Dockerfile
new file mode 100644
index 00000000..6135085f
--- /dev/null
+++ b/mailcatcher/Dockerfile
@@ -0,0 +1,7 @@
+FROM schickling/mailcatcher
+
+LABEL maintainer="Johannes Schickling <schickling.j@gmail.com>"
+
+CMD ["mailcatcher", "--no-quit", "--foreground", "--ip=0.0.0.0"]
+
+EXPOSE 1025 1080