diff --git a/build/docker-compose.common.yml b/build/docker-compose.common.yml
index 6b7e860a3a..2d525e6cdc 100644
--- a/build/docker-compose.common.yml
+++ b/build/docker-compose.common.yml
@@ -84,7 +84,7 @@ services:
       LDAP_DOMAIN: "mm.test.com"
       LDAP_ADMIN_PASSWORD: "mostest"
   elasticsearch:
-    image: "mattermost/mattermost-elasticsearch-docker:6.5.1"
+    image: "mattermost/mattermost-elasticsearch-docker:7.0.0"
     networks:
       - mm-test
     environment:
diff --git a/build/gitlab-dc.common.yml b/build/gitlab-dc.common.yml
index c18769c878..e788ef983c 100644
--- a/build/gitlab-dc.common.yml
+++ b/build/gitlab-dc.common.yml
@@ -23,7 +23,7 @@ services:
       LDAP_DOMAIN: "mm.test.com"
       LDAP_ADMIN_PASSWORD: "mostest"
   elasticsearch:
-    image: ${CI_REGISTRY}/mattermost/ci/images/mattermost-elasticsearch-docker:6.5.1-1
+    image: ${CI_REGISTRY}/mattermost/ci/images/mattermost-elasticsearch-docker:7.0.0
     environment:
       http.host: "0.0.0.0"
       http.port: 9200