diff --git a/server/build/docker-compose.common.yml b/server/build/docker-compose.common.yml
index a3bc9ae2fd..0e2fe5dde3 100644
--- a/server/build/docker-compose.common.yml
+++ b/server/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.17.3"
+    image: "mattermostdevelopment/mattermost-elasticsearch:7.17.10"
     networks:
       - mm-test
     environment:
diff --git a/server/docker-compose.makefile.m1.yml b/server/docker-compose.makefile.m1.yml
index 69255bae05..6981714007 100644
--- a/server/docker-compose.makefile.m1.yml
+++ b/server/docker-compose.makefile.m1.yml
@@ -1,7 +1,7 @@
 version: '2.4'
 services:
   elasticsearch:
-    image: "elasticsearch:7.17.3"
+    image: "mattermostdevelopment/mattermost-elasticsearch:7.17.10"
     platform: linux/arm64/v8
     restart: 'no'
     container_name: mattermost-elasticsearch