diff --git a/chart/skywalking/Chart.yaml b/chart/skywalking/Chart.yaml
index 1181569..a4ec3e1 100644
--- a/chart/skywalking/Chart.yaml
+++ b/chart/skywalking/Chart.yaml
@@ -45,6 +45,6 @@ dependencies:
   condition: postgresql.enabled
 - name: skywalking-banyandb-helm
   alias: banyandb
-  version: 0.6.0-rc6
+  version: 0.6.0
   repository: oci://registry-1.docker.io/apache
   condition: banyandb.enabled
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 13837ef..f633102 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -387,9 +387,6 @@ banyandb:
           limits:
             - key: memory
               value: 256Mi
-  etcd:
-    enabled: false
-    replicaCount: 1
 
 satellite:
   name: satellite
diff --git a/test/e2e/e2e-banyandb-standalone.yaml b/test/e2e/e2e-banyandb-standalone.yaml
index c0b6adf..244cb66 100644
--- a/test/e2e/e2e-banyandb-standalone.yaml
+++ b/test/e2e/e2e-banyandb-standalone.yaml
@@ -60,7 +60,6 @@ setup:
                        --set banyandb.enabled=true \
                        --set banyandb.standalone.enabled=true \
                        --set banyandb.cluster.enabled=false \
-                       --set banyandb.etcd.enabled=false \
                        --set banyandb.auth.enabled=true \
                        --set satellite.enabled=true \
                        --set satellite.image.repository=$SATELLITE_REPO \
diff --git a/test/e2e/setup-e2e-shell/install-etcdctl.sh b/test/e2e/setup-e2e-shell/install-etcdctl.sh
deleted file mode 100644
index da8bebd..0000000
--- a/test/e2e/setup-e2e-shell/install-etcdctl.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-BASE_DIR=$1
-BIN_DIR=$2
-
-if ! command -v etcdctl &> /dev/null; then
-  mkdir -p $BASE_DIR/etcdctl && cd $BASE_DIR/etcdctl
-  utype=$(uname | awk '{print tolower($0)}')
-  suffix=
-  if [ $utype = "darwin" ]
-  then
-      suffix="zip"
-  else
-      suffix="tar.gz"
-  fi
-  curl -kLo etcdctl.$suffix https://github.com/coreos/etcd/releases/download/v3.5.0/etcd-v3.5.0-$utype-amd64.$suffix
-  tar -zxf etcdctl.$suffix --strip=1
-  cp etcdctl $BIN_DIR/
-fi
\ No newline at end of file
diff --git a/test/e2e/swck/oap-agent-adapter-hpa.yaml b/test/e2e/swck/oap-agent-adapter-hpa.yaml
index 3bea0e0..99c49dc 100644
--- a/test/e2e/swck/oap-agent-adapter-hpa.yaml
+++ b/test/e2e/swck/oap-agent-adapter-hpa.yaml
@@ -72,8 +72,7 @@ setup:
                        --set image.repository=$BANYANDB_REPO \
                        --set image.tag=$BANYANDB_TAG \
                        --set standalone.enabled=true \
-                       --set cluster.enabled=false \
-                       --set etcd.enabled=false
+                       --set cluster.enabled=false
       wait:
         - namespace: default
           resource: pod
diff --git a/test/e2e/swck/oap-agent-banyandb.yaml b/test/e2e/swck/oap-agent-banyandb.yaml
index 45038e0..fe02c6d 100644
--- a/test/e2e/swck/oap-agent-banyandb.yaml
+++ b/test/e2e/swck/oap-agent-banyandb.yaml
@@ -60,8 +60,7 @@ setup:
                        --set image.repository=$BANYANDB_REPO \
                        --set image.tag=$BANYANDB_TAG \
                        --set standalone.enabled=true \
-                       --set cluster.enabled=false \
-                       --set etcd.enabled=false
+                       --set cluster.enabled=false
       wait:
         - namespace: default
           resource: pod
diff --git a/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml b/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
index 1f1133c..fb54bc4 100644
--- a/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
+++ b/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
@@ -63,8 +63,7 @@ setup:
                        --set image.repository=$BANYANDB_REPO \
                        --set image.tag=$BANYANDB_TAG \
                        --set standalone.enabled=true \
-                       --set cluster.enabled=false \
-                       --set etcd.enabled=false
+                       --set cluster.enabled=false
       wait:
         - namespace: default
           resource: pod
diff --git a/test/e2e/swck/oap-ui-agent-satellite.yaml b/test/e2e/swck/oap-ui-agent-satellite.yaml
index e5294c1..7653ddc 100644
--- a/test/e2e/swck/oap-ui-agent-satellite.yaml
+++ b/test/e2e/swck/oap-ui-agent-satellite.yaml
@@ -60,8 +60,7 @@ setup:
                        --set image.repository=$BANYANDB_REPO \
                        --set image.tag=$BANYANDB_TAG \
                        --set standalone.enabled=true \
-                       --set cluster.enabled=false \
-                       --set etcd.enabled=false
+                       --set cluster.enabled=false
       wait:
         - namespace: default
           resource: pod