diff --git a/build/docker-compose.common.yml b/build/docker-compose.common.yml
index 883f27548d..a8adc29e08 100644
--- a/build/docker-compose.common.yml
+++ b/build/docker-compose.common.yml
@@ -53,5 +53,10 @@ services:
       - mm-test
     environment:
       http.host: "0.0.0.0"
+      http.port: 9200
+      http.cors.enabled: "true"
+      http.cors.allow-origin: "http://localhost:1358,http://127.0.0.1:1358"
+      http.cors.allow-headers: "X-Requested-With,X-Auth-Token,Content-Type,Content-Length,Authorization"
+      http.cors.allow-credentials: "true"
       transport.host: "127.0.0.1"
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"
diff --git a/build/docker-compose.optional.yml b/build/docker-compose.optional.yml
new file mode 100644
index 0000000000..f41add2edd
--- /dev/null
+++ b/build/docker-compose.optional.yml
@@ -0,0 +1,6 @@
+version: '2.4'
+services:
+  dejavu:
+    image: "appbaseio/dejavu:3.4.2"
+    networks:
+      - mm-test
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b089998dde..3f47f9d830 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -46,6 +46,14 @@ services:
     extends:
         file: build/docker-compose.common.yml
         service: elasticsearch
+  dejavu:
+    container_name: mattermost-dejavu
+    ports:
+      - "1358:1358"
+    extends:
+        file: build/docker-compose.optional.yml
+        service: dejavu
+
   start_dependencies:
     image: mattermost/mattermost-wait-for-dep:latest
     networks: