diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml
index f54bba672e..df4a11576d 100644
--- a/bitnami/redis/Chart.yaml
+++ b/bitnami/redis/Chart.yaml
@@ -34,4 +34,4 @@ maintainers:
 name: redis
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/redis
-version: 18.3.3
+version: 18.4.0
diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md
index b921aa0786..6305aaf828 100644
--- a/bitnami/redis/README.md
+++ b/bitnami/redis/README.md
@@ -172,7 +172,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `master.containerSecurityContext.allowPrivilegeEscalation` | Is it possible to escalate Redis® pod(s) privileges                                               | `false`                  |
 | `master.containerSecurityContext.seccompProfile.type`      | Set Redis® master containers' Security Context seccompProfile                                     | `RuntimeDefault`         |
 | `master.containerSecurityContext.capabilities.drop`        | Set Redis® master containers' Security Context capabilities to drop                               | `["ALL"]`                |
-| `master.kind`                                              | Use either Deployment or StatefulSet (default)                                                        | `StatefulSet`            |
+| `master.kind`                                              | Use either Deployment, StatefulSet (default) or DaemonSet                                             | `StatefulSet`            |
 | `master.schedulerName`                                     | Alternate scheduler for Redis® master pods                                                        | `""`                     |
 | `master.updateStrategy.type`                               | Redis® master statefulset strategy type                                                           | `RollingUpdate`          |
 | `master.minReadySeconds`                                   | How many seconds a pod needs to be ready before killing the next, during update                       | `0`                      |
diff --git a/bitnami/redis/templates/master/application.yaml b/bitnami/redis/templates/master/application.yaml
index 2f5f1a3f62..8fdaec1256 100644
--- a/bitnami/redis/templates/master/application.yaml
+++ b/bitnami/redis/templates/master/application.yaml
@@ -16,7 +16,9 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
+  {{- if not (eq .Values.master.kind "DaemonSet") }}
   replicas: {{ .Values.master.count }}
+  {{- end }}
   {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.master.podLabels .Values.commonLabels ) "context" . ) }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
@@ -472,7 +474,7 @@ spec:
         {{- if .Values.metrics.extraVolumes }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }}
         {{- end }}
-  {{- if not .Values.master.persistence.enabled }}
+  {{- if or (not .Values.master.persistence.enabled) (eq .Values.master.kind "DaemonSet") }}
         - name: redis-data
           {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }}
           emptyDir:
diff --git a/bitnami/redis/templates/replicas/application.yaml b/bitnami/redis/templates/replicas/application.yaml
index 692695fa44..821bf8d1ac 100644
--- a/bitnami/redis/templates/replicas/application.yaml
+++ b/bitnami/redis/templates/replicas/application.yaml
@@ -135,7 +135,7 @@ spec:
             - name: REDIS_MASTER_HOST
             {{- if .Values.replica.externalMaster.enabled }}
               value: {{ .Values.replica.externalMaster.host | quote }}
-            {{- else if and (eq (int64 .Values.master.count) 1) (ne .Values.master.kind "Deployment") }}
+            {{- else if and (eq (int64 .Values.master.count) 1) (eq .Values.master.kind "StatefulSet") }}
               value: {{ template "common.names.fullname" . }}-master-0.{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
             {{- else }}
               value: {{ template "common.names.fullname" . }}-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
diff --git a/bitnami/redis/values.schema.json b/bitnami/redis/values.schema.json
index 2cfd8489d2..e9feba6adc 100644
--- a/bitnami/redis/values.schema.json
+++ b/bitnami/redis/values.schema.json
@@ -40,8 +40,8 @@
           "type": "string",
           "title": "Workload Kind",
           "form": true,
-          "description": "Allowed values: `Deployment` or `StatefulSet`",
-          "enum": ["Deployment", "StatefulSet"]
+          "description": "Allowed values: `Deployment`, `StatefulSet` or `DaemonSet`",
+          "enum": ["Deployment", "StatefulSet", "DaemonSet"]
         },
         "persistence": {
           "type": "object",
diff --git a/bitnami/redis/values.yaml b/bitnami/redis/values.yaml
index 0c60d5b4fb..f2d53313b1 100644
--- a/bitnami/redis/values.yaml
+++ b/bitnami/redis/values.yaml
@@ -299,7 +299,7 @@ master:
     capabilities:
       drop:
         - ALL
-  ## @param master.kind Use either Deployment or StatefulSet (default)
+  ## @param master.kind Use either Deployment, StatefulSet (default) or DaemonSet
   ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/
   ##
   kind: StatefulSet