diff --git a/deploy/etcd-cluster/values.yaml b/deploy/etcd-cluster/values.yaml
index 47ff849f7e7..b1942938125 100644
--- a/deploy/etcd-cluster/values.yaml
+++ b/deploy/etcd-cluster/values.yaml
@@ -57,7 +57,7 @@ resources: { }
 persistence:
   ## @param shard[*].persistence.enabled Enable persistence using Persistent Volume Claims
   ##
-  enabled: false
+  enabled: true
   ## `data` volume settings
   ##
   data:
@@ -71,7 +71,7 @@ persistence:
     storageClassName:
     ## @param shard[*].persistence.size Size of data volume
     ##
-    size: 10Gi
+    size: 1Gi
 
 ingress:
   ## @param ingress.enabled Enable ingress record generation for etcd
diff --git a/deploy/etcd/templates/clusterdefinition.yaml b/deploy/etcd/templates/clusterdefinition.yaml
index bb472677a9e..5fa41b864b0 100644
--- a/deploy/etcd/templates/clusterdefinition.yaml
+++ b/deploy/etcd/templates/clusterdefinition.yaml
@@ -21,7 +21,7 @@ spec:
             isLeader: false
             canVote: true
         roleProbe:
-          probeActions:
+          customHandler:
             - image: quay.io/coreos/etcd:v3.5.6
               command:
                 - |
@@ -70,13 +70,12 @@ spec:
                 # TODO: clusterDomain 'cluster.local' requires configurable
                 MY_PEER=$KB_POD_FQDN{{ .Values.clusterDomain }}
                 exec etcd --name ${HOSTNAME} \
+                --experimental-initial-corrupt-check=true \
                 --listen-peer-urls http://0.0.0.0:2380 \
                 --listen-client-urls http://0.0.0.0:2379 \
                 --advertise-client-urls http://${MY_PEER}:2379 \
                 --initial-advertise-peer-urls http://${MY_PEER}:2380 \
-                --initial-cluster-token etcd-cluster-1 \
                 --initial-cluster ${PEERS} \
-                --initial-cluster-state new \
                 --data-dir /var/run/etcd/default.etcd
   connectionCredential:
     username: root
diff --git a/test/e2e/testdata/smoketest/etcd/00_etcdcluster.yaml b/test/e2e/testdata/smoketest/etcd/00_etcdcluster.yaml
index 0a93c1afd69..fa5facd6e00 100644
--- a/test/e2e/testdata/smoketest/etcd/00_etcdcluster.yaml
+++ b/test/e2e/testdata/smoketest/etcd/00_etcdcluster.yaml
@@ -23,3 +23,12 @@ spec:
       monitor: false
       replicas: 3
       serviceAccountName: kb-etcd-cluster
+      volumeClaimTemplates:
+        - name: data # ref clusterdefinition components.containers.volumeMounts.name
+          spec:
+            storageClassName: 
+            accessModes:
+              - ReadWriteOnce
+            resources:
+              requests:
+                storage: 1Gi