diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4bc2b39..577480f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 10.2.5
+## Unreleased
 
 ### New features
 
diff --git a/docker-compose.yml b/docker-compose.yml
index a57f7dbe..6dd1f646 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,8 @@ services:
       - xpack.license.self_generated.type=basic
       # Without an explicit heap, ES sizes it to 50% of host RAM and mlocks it
       # (bootstrap.memory_lock), which OOM-kills the container on large hosts.
-      - ES_JAVA_OPTS=-Xms2g -Xmx2g
+      # Override via ES_JAVA_OPTS in .env for smaller machines.
+      - ES_JAVA_OPTS=${ES_JAVA_OPTS:--Xms2g -Xmx2g}
     ports:
       - "127.0.0.1:9200:9200"
     ulimits: