diff --git a/bitnami/etcd/Chart.yaml b/bitnami/etcd/Chart.yaml
index ff76abe65..7c7d0e8d8 100644
--- a/bitnami/etcd/Chart.yaml
+++ b/bitnami/etcd/Chart.yaml
@@ -25,4 +25,4 @@ name: etcd
 sources:
   - https://github.com/bitnami/bitnami-docker-etcd
   - https://coreos.com/etcd/
-version: 6.1.2
+version: 6.1.3
diff --git a/bitnami/etcd/templates/statefulset.yaml b/bitnami/etcd/templates/statefulset.yaml
index 17998e20b..35652e3eb 100644
--- a/bitnami/etcd/templates/statefulset.yaml
+++ b/bitnami/etcd/templates/statefulset.yaml
@@ -154,11 +154,11 @@ spec:
               value: "{{ $etcdPeerProtocol }}://0.0.0.0:{{ .Values.service.peerPort }}"
             {{- if .Values.autoCompactionMode }}
             - name: ETCD_AUTO_COMPACTION_MODE
-              value: {{ .Values.autoCompactionMode }}
+              value: {{ .Values.autoCompactionMode | quote }}
             {{- end }}
             {{- if .Values.autoCompactionRetention }}
             - name: ETCD_AUTO_COMPACTION_RETENTION
-              value: {{ .Values.autoCompactionRetention }}
+              value: {{ .Values.autoCompactionRetention | quote }}
             {{- end }}
             {{- if .Values.maxProcs }}
             - name: GOMAXPROCS
@@ -354,7 +354,7 @@ spec:
         {{- end }}
         resources:
           requests:
-            storage: {{ .Values.persistence.size | quote }}        
+            storage: {{ .Values.persistence.size | quote }}
         {{- if .Values.persistence.selector }}
         selector: {{- include "common.tplvalues.render" ( dict "value" .Values.persistence.selector "context" $) | nindent 10 }}
         {{- end }}