diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
index 656abbf..be58810 100644
--- a/docker-compose-ci.yml
+++ b/docker-compose-ci.yml
@@ -20,6 +20,10 @@ services:
       <<: *wikibase_variables
     volumes:
       - ./mediawiki/LocalSettings.d:/var/www/html/LocalSettings.d:ro
+
+  elasticsearch:
+    environment:
+      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
       
   wdqs-frontend:
     ports:
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index ed939ae..29b91b8 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -49,6 +49,8 @@ services:
 
   elasticsearch:
     restart: ${RESTART}
+    environment:
+      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
 
   wdqs:
     restart: ${RESTART}