diff --git a/chart/skywalking/templates/es-init.job.yaml b/chart/skywalking/templates/es-init.job.yaml
index c415902c3ad270801427cc2fef5dc1afd49cfd19..7e3a01f5a7893df5c2b53ec7bf26a7591591424e 100644
--- a/chart/skywalking/templates/es-init.job.yaml
+++ b/chart/skywalking/templates/es-init.job.yaml
@@ -54,4 +54,16 @@ spec:
           value: "{{ .Values.elasticsearch.clusterName }}-{{ .Values.elasticsearch.nodeGroup }}:{{ .Values.elasticsearch.httpPort }}"
   {{- else }}
           value: "{{ .Values.elasticsearch.config.host }}:{{ .Values.elasticsearch.config.port.http }}"
-{{- end }}
\ No newline at end of file
+{{- end }}
+        {{- if .Values.elasticsearch.config.user }}
+        - name: SW_ES_USER
+          value: "{{ .Values.elasticsearch.config.user }}"
+        {{- end }}
+        {{- if .Values.elasticsearch.config.password }}
+        - name: SW_ES_PASSWORD
+          value: "{{ .Values.elasticsearch.config.password }}"
+        {{- end }}
+        {{- range $key, $value :=  .Values.oap.env }}
+        - name: {{ $key }}
+          value: {{ $value | quote }}
+        {{- end }}
diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml
index a82f3e6d1b59cd196e333074be37eb92e92b789e..5f75524a10f2d47f289f0e6598abd1a60afd21cc 100644
--- a/chart/skywalking/templates/oap-deployment.yaml
+++ b/chart/skywalking/templates/oap-deployment.yaml
@@ -126,6 +126,14 @@ spec:
 {{- else }}
           value: "{{ .Values.elasticsearch.config.host }}:{{ .Values.elasticsearch.config.port.http }}"
 {{- end }}
+        {{- if .Values.elasticsearch.config.user }}
+        - name: SW_ES_USER
+          value: "{{ .Values.elasticsearch.config.user }}"
+        {{- end }}
+        {{- if .Values.elasticsearch.config.password }}
+        - name: SW_ES_PASSWORD
+          value: "{{ .Values.elasticsearch.config.password }}"
+        {{- end }}
         {{- range $key, $value :=  .Values.oap.env }}
         - name: {{ $key }}
           value: {{ $value | quote }}
diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
index 15467f8ae04219b944d4438c840fe15fe061bc2d..e7647d682d20c6d1c4ea44b83318252210706a99 100644
--- a/chart/skywalking/values-es6.yaml
+++ b/chart/skywalking/values-es6.yaml
@@ -104,6 +104,8 @@ elasticsearch:
 #    port:
 #      http: 9200
 #    host: elasticsearch # es service on kubernetes or host
+#    user: "xxx"
+#    password: "xxx"
   clusterName: "elasticsearch"
   nodeGroup: "master"
 
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 2d3a38a68778e9b1e4da9eda85cb280393f1d267..883b97e08fdc7577431cfb7fd637bca974b6da3a 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -104,6 +104,8 @@ elasticsearch:
 #    port:
 #      http: 9200
 #    host: elasticsearch # es service on kubernetes or host
+#    user: "xxx"
+#    password: "xxx"
   clusterName: "elasticsearch"
   nodeGroup: "master"