diff --git a/docker-compose.overrides.yml b/docker-compose.overrides.yml
deleted file mode 100644
index ceabac165d6..00000000000
--- a/docker-compose.overrides.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
-  es:
-    # Memory limit for ES, as it tends to be a memory hoarder
-    mem_limit: 4294967296
diff --git a/docker/es/env.docker b/docker/es/env.docker
index cd80e5a6f57..fc94fccd046 100644
--- a/docker/es/env.docker
+++ b/docker/es/env.docker
@@ -6,3 +6,5 @@ discovery.type="single-node"
 
 http.cors.enabled="true"
 http.cors.allow-origin="/.*/"
+
+ES_JAVA_OPTS="-Xms512m -Xmx512m"
diff --git a/justfile b/justfile
index f3f22234615..f4a315808a9 100644
--- a/justfile
+++ b/justfile
@@ -9,7 +9,6 @@ IS_PROD := env_var_or_default("PROD", env_var_or_default("IS_PROD", ""))
 PROD_ENV := env_var_or_default("PROD_ENV", "")
 IS_CI := env_var_or_default("CI", "")
 DC_USER := env_var_or_default("DC_USER", "opener")
-ENABLE_DC_OVERRIDES := env_var_or_default("OPENVERSE_ENABLE_DC_OVERRIDES", "true")
 
 # Show all available recipes, also recurses inside nested justfiles
 @_default:
@@ -117,9 +116,6 @@ DOCKER_FILE := "-f " + (
         else { "docker-compose.yml" }
     }
     else { "docker-compose.yml" }
-) + (
-    if ENABLE_DC_OVERRIDES == "true" { " -f docker-compose.overrides.yml" }
-    else { "" }
 )
 EXEC_DEFAULTS := if IS_CI == "" { "" } else { "-T" }