diff --git a/build/docker-compose.common.yml b/build/docker-compose.common.yml
index 2d525e6cdc..6d15b22fe5 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:7.0.0"
+    image: "mattermost/mattermost-elasticsearch-docker:7.17.3"
     networks:
       - mm-test
     environment:
diff --git a/build/gitlab-dc.common.yml b/build/gitlab-dc.common.yml
index e788ef983c..935f0d2aa8 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:7.0.0
+    image: ${CI_REGISTRY}/mattermost/ci/images/mattermost-elasticsearch-docker:7.17.3
     environment:
       http.host: "0.0.0.0"
       http.port: 9200