diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml
index dae618bd4e..7fdc80553e 100644
--- a/bitnami/redis/Chart.yaml
+++ b/bitnami/redis/Chart.yaml
@@ -22,4 +22,4 @@ maintainers:
 name: redis
 sources:
   - https://github.com/bitnami/containers/tree/main/bitnami/redis
-version: 17.5.1
+version: 17.6.0
diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md
index 6142c13d4d..20373c9106 100644
--- a/bitnami/redis/README.md
+++ b/bitnami/redis/README.md
@@ -389,6 +389,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `sentinel.persistence.selector`               | Additional labels to match for the PVC                                                                                                      | `{}`                     |
 | `sentinel.persistence.dataSource`             | Custom PVC data source                                                                                                                      | `{}`                     |
 | `sentinel.persistence.medium`                 | Provide a medium for `emptyDir` volumes.                                                                                                    | `""`                     |
+| `sentinel.persistence.sizeLimit`              | Set this to enable a size limit for `emptyDir` volumes.                                                                                     | `""`                     |
 | `sentinel.resources.limits`                   | The resources limits for the Redis® Sentinel containers                                                                                 | `{}`                     |
 | `sentinel.resources.requests`                 | The requested resources for the Redis® Sentinel containers                                                                              | `{}`                     |
 | `sentinel.containerSecurityContext.enabled`   | Enabled Redis® Sentinel containers' Security Context                                                                                    | `true`                   |
diff --git a/bitnami/redis/templates/master/application.yaml b/bitnami/redis/templates/master/application.yaml
index 5d5ecf8e58..acff2e25e2 100644
--- a/bitnami/redis/templates/master/application.yaml
+++ b/bitnami/redis/templates/master/application.yaml
@@ -432,9 +432,11 @@ spec:
             path: /sys
         {{- end }}
         - name: redis-tmp-conf
-          {{- if .Values.master.persistence.medium }}
+          {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }}
           emptyDir:
+            {{- if .Values.master.persistence.medium }}
             medium: {{ .Values.master.persistence.medium | quote }}
+            {{- end }}
             {{- if .Values.master.persistence.sizeLimit }}
             sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }}
             {{- end }}
@@ -442,9 +444,11 @@ spec:
           emptyDir: {}
           {{- end }}
         - name: tmp
-          {{- if .Values.master.persistence.medium }}
+          {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }}
           emptyDir:
+            {{- if .Values.master.persistence.medium }}
             medium: {{ .Values.master.persistence.medium | quote }}
+            {{- end }}
             {{- if .Values.master.persistence.sizeLimit }}
             sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }}
             {{- end }}
@@ -465,10 +469,14 @@ spec:
         {{- end }}
   {{- if not .Values.master.persistence.enabled }}
         - name: redis-data
-          {{- if .Values.master.persistence.medium }}
-          emptyDir: {
+          {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }}
+          emptyDir:
+            {{- if .Values.master.persistence.medium }}
             medium: {{ .Values.master.persistence.medium | quote }}
-          }
+            {{- end }}
+            {{- if .Values.master.persistence.sizeLimit }}
+            sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }}
+            {{- end }}
           {{- else }}
           emptyDir: {}
           {{- end }}
diff --git a/bitnami/redis/templates/replicas/statefulset.yaml b/bitnami/redis/templates/replicas/statefulset.yaml
index db72e0cbe5..8a8541d7b7 100644
--- a/bitnami/redis/templates/replicas/statefulset.yaml
+++ b/bitnami/redis/templates/replicas/statefulset.yaml
@@ -447,9 +447,11 @@ spec:
             path: /sys
         {{- end }}
         - name: redis-tmp-conf
-          {{- if .Values.replica.persistence.medium }}
+          {{- if or .Values.replica.persistence.medium .Values.replica.persistence.sizeLimit }}
           emptyDir:
+            {{- if .Values.replica.persistence.medium }}
             medium: {{ .Values.replica.persistence.medium | quote }}
+            {{- end }}
             {{- if .Values.replica.persistence.sizeLimit }}
             sizeLimit: {{ .Values.replica.persistence.sizeLimit | quote }}
             {{- end }}
@@ -470,10 +472,14 @@ spec:
         {{- end }}
   {{- if not .Values.replica.persistence.enabled }}
         - name: redis-data
-          {{- if .Values.replica.persistence.medium }}
-          emptyDir: {
+          {{- if or .Values.replica.persistence.medium .Values.replica.persistence.sizeLimit }}
+          emptyDir:
+            {{- if .Values.replica.persistence.medium }}
             medium: {{ .Values.replica.persistence.medium | quote }}
-          }
+            {{- end }}
+            {{- if .Values.replica.persistence.sizeLimit }}
+            sizeLimit: {{ .Values.replica.persistence.sizeLimit | quote }}
+            {{- end }}
           {{- else }}
           emptyDir: {}
           {{- end }}
diff --git a/bitnami/redis/templates/sentinel/statefulset.yaml b/bitnami/redis/templates/sentinel/statefulset.yaml
index b0e32abd3a..205d559244 100644
--- a/bitnami/redis/templates/sentinel/statefulset.yaml
+++ b/bitnami/redis/templates/sentinel/statefulset.yaml
@@ -656,27 +656,39 @@ spec:
         {{- end }}
         {{- if not .Values.sentinel.persistence.enabled }}
         - name: sentinel-data
-          {{- if .Values.sentinel.persistence.medium }}
-          emptyDir: {
+          {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }}
+          emptyDir:
+            {{- if .Values.sentinel.persistence.medium }}
             medium: {{ .Values.sentinel.persistence.medium | quote }}
-          }
+            {{- end }}
+            {{- if .Values.sentinel.persistence.sizeLimit }}
+            sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }}
+            {{- end }}
           {{- else }}
           emptyDir: {}
           {{- end }}
         {{- end }}
         - name: redis-tmp-conf
-          {{- if .Values.replica.persistence.medium }}
-          emptyDir: {
-            medium: {{ .Values.replica.persistence.medium | quote }}
-          }
+          {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }}
+          emptyDir:
+            {{- if .Values.sentinel.persistence.medium }}
+            medium: {{ .Values.sentinel.persistence.medium | quote }}
+            {{- end }}
+            {{- if .Values.sentinel.persistence.sizeLimit }}
+            sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }}
+            {{- end }}
           {{- else }}
           emptyDir: {}
           {{- end }}
         - name: tmp
-          {{- if .Values.replica.persistence.medium }}
-          emptyDir: {
-            medium: {{ .Values.replica.persistence.medium | quote }}
-          }
+          {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }}
+          emptyDir:
+            {{- if .Values.sentinel.persistence.medium }}
+            medium: {{ .Values.sentinel.persistence.medium | quote }}
+            {{- end }}
+            {{- if .Values.sentinel.persistence.sizeLimit }}
+            sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }}
+            {{- end }}
           {{- else }}
           emptyDir: {}
           {{- end }}
@@ -697,10 +709,14 @@ spec:
         {{- end }}
   {{- if not .Values.replica.persistence.enabled }}
         - name: redis-data
-          {{- if .Values.replica.persistence.medium }}
-          emptyDir: {
-            medium: {{ .Values.replica.persistence.medium | quote }}
-          }
+          {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }}
+          emptyDir:
+            {{- if .Values.sentinel.persistence.medium }}
+            medium: {{ .Values.sentinel.persistence.medium | quote }}
+            {{- end }}
+            {{- if .Values.sentinel.persistence.sizeLimit }}
+            sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }}
+            {{- end }}
           {{- else }}
           emptyDir: {}
           {{- end }}
diff --git a/bitnami/redis/values.yaml b/bitnami/redis/values.yaml
index 03817e3484..2bbc7e4f65 100644
--- a/bitnami/redis/values.yaml
+++ b/bitnami/redis/values.yaml
@@ -1152,6 +1152,9 @@ sentinel:
     ## @param sentinel.persistence.medium Provide a medium for `emptyDir` volumes.
     ##
     medium: ""
+    ## @param sentinel.persistence.sizeLimit Set this to enable a size limit for `emptyDir` volumes.
+    ##
+    sizeLimit: ""
   ## Redis® Sentinel resource requests and limits
   ## ref: https://kubernetes.io/docs/user-guide/compute-resources/
   ## @param sentinel.resources.limits The resources limits for the Redis® Sentinel containers