diff --git a/voltha-infra/Chart.yaml b/voltha-infra/Chart.yaml
index ee8896b..337022f 100644
--- a/voltha-infra/Chart.yaml
+++ b/voltha-infra/Chart.yaml
@@ -29,7 +29,7 @@
 name: voltha-infra
 
 appVersion: "2.8-dev"
-version: 0.2.6
+version: 0.2.7
 
 dependencies:
   - name: onos-classic
@@ -42,7 +42,7 @@
     condition: bbsim-sadis-server.enabled
   - name: etcd
     repository: https://charts.bitnami.com/bitnami
-    version: 5.4.2
+    version: 6.2.5
     condition: etcd.enabled
   - name: kafka
     repository: https://charts.bitnami.com/bitnami
diff --git a/voltha-infra/templates/clusterrole.yaml b/voltha-infra/templates/clusterrole.yaml
index 504fafc..ba7a0aa 100644
--- a/voltha-infra/templates/clusterrole.yaml
+++ b/voltha-infra/templates/clusterrole.yaml
@@ -19,5 +19,5 @@
   namespace: {{ .Release.Namespace | quote }}
 rules:
   - apiGroups: [""]
-    resources: ["pods"]
-    verbs: ["get", "list", "watch"]
+    resources: ["pods", "pods/exec"]
+    verbs: ["get", "list", "watch", "create"]
diff --git a/voltha-infra/templates/etcd-periodic-defrag.yaml b/voltha-infra/templates/etcd-periodic-defrag.yaml
new file mode 100644
index 0000000..29b8083
--- /dev/null
+++ b/voltha-infra/templates/etcd-periodic-defrag.yaml
@@ -0,0 +1,44 @@
+---
+
+# Copyright 2021-present Open Networking Foundation
+#
+# Licensed 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.
+{{- if .Values.etcd.defrag.enabled }}
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: etcd-db-defrag
+spec:
+  schedule: {{ .Values.etcd.defrag.schedule | quote }}
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          restartPolicy: OnFailure
+          serviceAccountName: "{{ .Release.Name }}-onos-config-loader-service-account"
+          containers:
+            - name: etcd-db-defrag
+              image: '{{ tpl .Values.images.onos_config_loader.registry . }}{{ tpl .Values.images.onos_config_loader.repository . }}:{{ tpl .Values.images.onos_config_loader.tag . }}'
+              imagePullPolicy: {{ tpl .Values.images.onos_config_loader.pullPolicy . }}
+              command:
+                - /bin/sh
+                - -c
+                - kubectl exec -n  {{ .Release.Namespace }} {{ .Release.Name }}-etcd-0 -- etcdctl defrag --cluster
+              volumeMounts:
+                - name: kube-config-volume
+                  mountPath: /etc/kube
+          volumes:
+            - name: kube-config-volume
+              configMap:
+                name: kube-config
+{{- end -}}
diff --git a/voltha-infra/values.yaml b/voltha-infra/values.yaml
index 8b4a55d..4ad7171 100644
--- a/voltha-infra/values.yaml
+++ b/voltha-infra/values.yaml
@@ -73,6 +73,13 @@
 
 etcd:
   enabled: true
+
+  # ETCD defrag creates a CronJob that runs "etcdctl defrag --cluster"
+  # on a defined schedule
+  defrag:
+    enabled: false
+    schedule: "*/5 * * * *"
+
   ingress:
     enabled: false
     annotations:
@@ -94,6 +101,13 @@
     replicaCount: 1
   service:
     port: 2379
+  autoCompactionMode: "revision"
+  autoCompactionRetention: 1
+  extraEnvVars:
+    - name: ETCD_ELECTION_TIMEOUT
+      value: "5000"
+    - name: ETCD_HEARTBEAT_INTERVAL
+      value: "1000"
 
 kafka:
   enabled: true