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