diff --git a/voltha-etcd-cluster/Chart.yaml b/voltha-etcd-cluster/Chart.yaml
index b0923bc..4f9f6de 100644
--- a/voltha-etcd-cluster/Chart.yaml
+++ b/voltha-etcd-cluster/Chart.yaml
@@ -17,4 +17,4 @@
 description: Create an etcd-cluster using etcd-operator provided CRD
 icon: https://guide.opencord.org/logos/cord.svg
 name: voltha-etcd-cluster
-version: 2.1.0
+version: 2.1.1
diff --git a/voltha-etcd-cluster/templates/etcd-cluster.yaml b/voltha-etcd-cluster/templates/etcd-cluster.yaml
index 827ba0c..e41b67d 100644
--- a/voltha-etcd-cluster/templates/etcd-cluster.yaml
+++ b/voltha-etcd-cluster/templates/etcd-cluster.yaml
@@ -23,6 +23,8 @@
       limits:
         memory: {{ .Values.memoryLimit }}
     etcdEnv:
+    - name: ETCD_AUTO_COMPACTION_MODE
+      value: {{ quote .Values.autoCompactionMode }}
     - name: ETCD_AUTO_COMPACTION_RETENTION
       value: {{ quote .Values.autoCompactionRetention }}
     busyboxImage: {{ .Values.registry }}{{ .Values.images.busybox.repository }}:{{ tpl .Values.images.busybox.tag . }}
diff --git a/voltha-etcd-cluster/values.yaml b/voltha-etcd-cluster/values.yaml
index aece130..70031df 100644
--- a/voltha-etcd-cluster/values.yaml
+++ b/voltha-etcd-cluster/values.yaml
@@ -20,7 +20,10 @@
 clusterName: "voltha-etcd-cluster"
 clusterSize: 3
 memoryLimit: 1024Mi
-autoCompactionRetention: "12"
+# use revision based compaction.  runs every 5 minutes within etcd and keeps
+# autoCompactionRetention number of revisions
+autoCompactionMode: "revision"
+autoCompactionRetention: "10"
 
 # expose the etcd-cluster as a nodePort
 # etcdNodePort: 32379
@@ -29,7 +32,7 @@
 images:
   etcd:
     repository: "quay.io/coreos/etcd"
-    tag: "v3.2.18"
+    tag: "v3.4.1"
   busybox:
     repository: "busybox"
     tag: "1.28.1-glibc"
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 88e9da4..8c573b5 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.6
+version: 2.1.7
 appVersion: 2.1.1
diff --git a/voltha/requirements.yaml b/voltha/requirements.yaml
index f671d8a..1062c2d 100644
--- a/voltha/requirements.yaml
+++ b/voltha/requirements.yaml
@@ -20,5 +20,5 @@
     condition: private_kafka_cluster
   - name: voltha-etcd-cluster
     repository: file://../voltha-etcd-cluster
-    version: 2.1.0
+    version: 2.1.1
     condition: private_etcd_cluster