diff --git a/templates/configmap-env.yaml b/templates/configmap-env.yaml
index 51fc9da..3ce6ced 100644
--- a/templates/configmap-env.yaml
+++ b/templates/configmap-env.yaml
@@ -34,6 +34,7 @@ data:
   DEFAULT_LOCALE: {{ .Values.mastodon.locale }}
   {{- if .Values.elasticsearch.enabled }}
   ES_ENABLED: "true"
+  ES_PRESET: {{ .Values.elasticsearch.preset | default "single_node_cluster" | quote }}
   ES_HOST: {{ template "mastodon.elasticsearch.fullname" . }}-master-hl
   ES_PORT: "9200"
   {{- else if .Values.elasticsearch.hostname }}
@@ -44,6 +45,9 @@ data:
   {{- with .Values.elasticsearch.user }}
   ES_USER: {{ . }}
   {{- end }}
+  {{- with .Values.elasticsearch.user }}
+  ES_USER: {{ . }}
+  {{- end }}
   LOCAL_DOMAIN: {{ .Values.mastodon.local_domain }}
   {{- with .Values.mastodon.web_domain }}
   WEB_DOMAIN: {{ . }}