diff --git a/docker/docker-compose.search.yml b/docker/docker-compose.search.yml
index a42f502..df19162 100644
--- a/docker/docker-compose.search.yml
+++ b/docker/docker-compose.search.yml
@@ -1,64 +1,67 @@
 version: "2.1"
 
 services:
   elasticsearch:
-    image: elasticsearch:7.9.3
     env_file:
       - ./env/elasticsearch.env
+    image: elastic/elasticsearch:7.15.2
+    environment:
+      - ingest.geoip.downloader.enabled=false
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ports:
       - 9200:9200
     volumes:
       - elasticsearch-data:/usr/share/elasticsearch/data
 
   swh-search:
     image: swh/stack
     build: ./
     entrypoint: /entrypoint.sh
     ports:
       - 5010:5010
     depends_on:
       - elasticsearch
     environment:
       SWH_CONFIG_FILENAME: /search.yml
     env_file:
       - ./env/common_python.env
     volumes:
       - "./conf/search.yml:/search.yml:ro"
       - "./services/swh-search/entrypoint.sh:/entrypoint.sh:ro"
 
   swh-search-journal-client-objects:
     image: swh/stack
     build: ./
     entrypoint: /entrypoint.sh
     depends_on:
       kafka:
         condition: service_healthy
       swh-search:
         condition: service_started
     volumes:
       - "./conf/search_journal_client_objects.yml:/etc/softwareheritage/search/journal_client.yml:ro"
       - "./services/swh-search-journal-client/entrypoint.sh:/entrypoint.sh:ro"
 
   swh-search-journal-client-indexed:
     image: swh/stack
     build: ./
     entrypoint: /entrypoint.sh
     depends_on:
       kafka:
         condition: service_healthy
       swh-search:
         condition: service_started
     volumes:
       - "./conf/search_journal_client_indexed.yml:/etc/softwareheritage/search/journal_client.yml:ro"
       - "./services/swh-search-journal-client/entrypoint.sh:/entrypoint.sh:ro"
 
   swh-web:
     depends_on:
       - swh-search
     environment:
       SWH_CONFIG_FILENAME: /web-search.yml
     volumes:
       - "./conf/web-search.yml:/web-search.yml:ro"
 
 volumes:
   elasticsearch-data: