diff --git a/chart/skywalking/Chart.yaml b/chart/skywalking/Chart.yaml
index 4d841d5ffe215e6b7e1b7c125340543f874997b0..3efdefb9c980f34ddc0f3979fed18fdc38ab9258 100644
--- a/chart/skywalking/Chart.yaml
+++ b/chart/skywalking/Chart.yaml
@@ -16,8 +16,8 @@
 apiVersion: v2
 name: skywalking
 home: https://skywalking.apache.org
-version: 1.1.0
-appVersion: 6.6.0
+version: 2.0.0
+appVersion: 7.0.0
 description: Apache SkyWalking APM System
 icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
 sources:
diff --git a/chart/skywalking/templates/es-init.job.yaml b/chart/skywalking/templates/es-init.job.yaml
index c690a6759f936e375949336b94e4037397506ac2..a2b626d2110f33c6e684f6bd7bc19222d2873d2e 100644
--- a/chart/skywalking/templates/es-init.job.yaml
+++ b/chart/skywalking/templates/es-init.job.yaml
@@ -48,7 +48,7 @@ spec:
         - name: JAVA_OPTS
           value: "{{ .Values.oap.javaOpts }} -Dmode=init"
         - name: SW_STORAGE
-          value: elasticsearch
+          value: {{ .Values.oap.storageType }}
         - name: SW_STORAGE_ES_CLUSTER_NODES
 {{- if .Values.elasticsearch.enabled }}
           value: "{{ .Values.elasticsearch.clusterName }}-{{ .Values.elasticsearch.nodeGroup }}:{{ .Values.elasticsearch.httpPort }}"
diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml
index 505873de188e94c00a78bcff0f22b49ee7bfdc5e..9d6c956d96da1e5d244fba7752f0260f8a988d9c 100644
--- a/chart/skywalking/templates/oap-deployment.yaml
+++ b/chart/skywalking/templates/oap-deployment.yaml
@@ -115,7 +115,7 @@ spec:
             fieldRef:
               fieldPath: metadata.uid
         - name: SW_STORAGE
-          value: elasticsearch
+          value: {{ .Values.oap.storageType }}
         {{- if .Values.oap.envoy.als.enabled }}
         - name: SW_ENVOY_ALS_ENABLED
           value: {{ .Values.oap.envoy.als.enabled | quote}}
diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
index 7356ebe6e3cb581fe83cc422c2ee745d583a9582..c6764d0416c7f1135e421a908348c8fe01f24401 100644
--- a/chart/skywalking/values-es6.yaml
+++ b/chart/skywalking/values-es6.yaml
@@ -24,8 +24,9 @@ oap:
   name: skywalking-oap
   image:
     repository: apache/skywalking-oap-server
-    tag: 6.6.0-es6
+    tag: 7.0.0-es6
     pullPolicy: IfNotPresent
+  storageType: elasticsearch
   ports:
     grpc: 11800
     rest: 12800
@@ -61,7 +62,7 @@ ui:
   replicas: 1
   image:
     repository: apache/skywalking-ui
-    tag: 6.6.0
+    tag: 7.0.0
     pullPolicy: IfNotPresent
   # podAnnotations:
   #   example: oap-foo
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 5e8870e6cda42a3fa112e66aec3ad13ed2217e35..0170caf83af704170dd091a8ce50d1d5feb0a131 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -24,8 +24,9 @@ oap:
   name: skywalking-oap
   image:
     repository: apache/skywalking-oap-server
-    tag: 6.6.0-es7
+    tag: 7.0.0-es7
     pullPolicy: IfNotPresent
+  storageType: elasticsearch7
   ports:
     grpc: 11800
     rest: 12800
@@ -61,7 +62,7 @@ ui:
   replicas: 1
   image:
     repository: apache/skywalking-ui
-    tag: 6.6.0
+    tag: 7.0.0
     pullPolicy: IfNotPresent
   # podAnnotations:
   #   example: oap-foo