diff --git a/k8s/helmfile/env/local/elasticsearch-1.values.yaml.gotmpl b/k8s/helmfile/env/local/elasticsearch-1.values.yaml.gotmpl
index 8622dac60..45b3d5e32 100644
--- a/k8s/helmfile/env/local/elasticsearch-1.values.yaml.gotmpl
+++ b/k8s/helmfile/env/local/elasticsearch-1.values.yaml.gotmpl
@@ -7,6 +7,7 @@ annotations:
   traffic.sidecar.istio.io/excludeInboundPorts: "9300"
 
 master:
+  heapSize: 256m
   resources:
     requests:
       cpu: "250m"
@@ -20,6 +21,7 @@ master:
     size: 1Gi
 
 data:
+  heapSize: 512m
   resources:
     requests:
       cpu: "250m"
@@ -33,6 +35,7 @@ data:
     size: 2Gi
 
 coordinating:
+  heapSize: 256m
   resources:
     requests:
       cpu: "250m"
diff --git a/k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl b/k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl
index e1b38bb54..ad16749cf 100644
--- a/k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl
@@ -11,6 +11,7 @@ extraConfig:
   action.auto_create_index: false
 
 master:
+  heapSize: 2048m
   resources:
     requests:
       cpu: "2"
@@ -25,6 +26,7 @@ master:
     size: 5Gi
 
 data:
+  heapSize: 32768m
   resources:
     requests:
       cpu: "10"
@@ -39,6 +41,7 @@ data:
     size: 50Gi
 
 coordinating:
+  heapSize: 2048m
   resources:
     requests:
       cpu: "2"
diff --git a/k8s/helmfile/env/staging/elasticsearch-1.values.yaml.gotmpl b/k8s/helmfile/env/staging/elasticsearch-1.values.yaml.gotmpl
index 2bcc6ac1e..9e63b9a4e 100644
--- a/k8s/helmfile/env/staging/elasticsearch-1.values.yaml.gotmpl
+++ b/k8s/helmfile/env/staging/elasticsearch-1.values.yaml.gotmpl
@@ -7,6 +7,7 @@ annotations:
   traffic.sidecar.istio.io/excludeInboundPorts: "9300"
 
 master:
+  heapSize: 512m
   resources:
     requests:
       cpu: "1"
@@ -21,6 +22,7 @@ master:
     size: 5Gi
 
 data:
+  heapSize: 2048m
   resources:
     requests:
       cpu: "1"
@@ -35,6 +37,7 @@ data:
     size: 10Gi
 
 coordinating:
+  heapSize: 512m
   resources:
     requests:
       cpu: "0.5"