diff --git a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml
index 75ea024..699dfc3 100644
--- a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml
@@ -74,7 +74,9 @@
               fieldRef:
                 fieldPath: status.podIP
           - name: ES_HEAP_SIZE
-            value: {{ .Values.config.elasticHeapSize }}
+            value: {{ .Values.config.JvmHeapSize }}
+          - name: ES_JAVA_OPTS
+            value: {{ .Values.config.JvmOptions }}
           volumeMounts:
           - name: {{ include "common.fullname" . }}-environments
             mountPath: /root/chef-solo/environments/
diff --git a/kubernetes/sdc/charts/sdc-es/values.yaml b/kubernetes/sdc/charts/sdc-es/values.yaml
index 4dddbed..db8e6b7 100644
--- a/kubernetes/sdc/charts/sdc-es/values.yaml
+++ b/kubernetes/sdc/charts/sdc-es/values.yaml
@@ -40,7 +40,8 @@
 
 # application configuration
 config:
-  elasticHeapSize: 1024M
+  JvmHeapSize: "1024M"
+  JvmOptions: "-Xms512m -Xmx512m"
 
 # default number of instances
 replicaCount: 1