diff --git a/roles/etcd/templates/etcd.service.j2 b/roles/etcd/templates/etcd.service.j2
index f2f9fba2f..65e56d83e 100644
--- a/roles/etcd/templates/etcd.service.j2
+++ b/roles/etcd/templates/etcd.service.j2
@@ -23,7 +23,11 @@ ExecStart={{ bin_dir }}/etcd \
   --initial-cluster-token=etcd-cluster-0 \
   --initial-cluster={{ ETCD_NODES }} \
   --initial-cluster-state={{ CLUSTER_STATE }} \
-  --data-dir=/var/lib/etcd
+  --data-dir=/var/lib/etcd \
+  --auto-compaction-retention=1 \
+  --max-request-bytes=10485760 \
+  --quota-backend-bytes=8589934592
+Restart=on-failure
 Restart=always
 RestartSec=5
 LimitNOFILE=65536