diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml
index 81e0ff1c9b..44db99a184 100644
--- a/bitnami/redis/Chart.yaml
+++ b/bitnami/redis/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: redis
-version: 10.5.14
+version: 10.6.0
 appVersion: 5.0.8
 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
 keywords:
diff --git a/bitnami/redis/templates/configmap.yaml b/bitnami/redis/templates/configmap.yaml
index d17ec26abf..ecfc063530 100644
--- a/bitnami/redis/templates/configmap.yaml
+++ b/bitnami/redis/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "redis.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/headless-svc.yaml b/bitnami/redis/templates/headless-svc.yaml
index 909cbceafd..21082b2227 100644
--- a/bitnami/redis/templates/headless-svc.yaml
+++ b/bitnami/redis/templates/headless-svc.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "redis.fullname" . }}-headless
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/health-configmap.yaml b/bitnami/redis/templates/health-configmap.yaml
index aefd22afa2..dd322fdc52 100644
--- a/bitnami/redis/templates/health-configmap.yaml
+++ b/bitnami/redis/templates/health-configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "redis.fullname" . }}-health
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/metrics-prometheus.yaml b/bitnami/redis/templates/metrics-prometheus.yaml
index 3f3345430f..af9a669755 100644
--- a/bitnami/redis/templates/metrics-prometheus.yaml
+++ b/bitnami/redis/templates/metrics-prometheus.yaml
@@ -5,6 +5,8 @@ metadata:
   name: {{ template "redis.fullname" . }}
   {{- if .Values.metrics.serviceMonitor.namespace }}
   namespace: {{ .Values.metrics.serviceMonitor.namespace }}
+  {{- else }}
+  namespace: {{ .Release.Namespace }}
   {{- end }}
   labels:
     app: {{ template "redis.name" . }}
diff --git a/bitnami/redis/templates/metrics-svc.yaml b/bitnami/redis/templates/metrics-svc.yaml
index 74f6fa8529..141c8fce90 100644
--- a/bitnami/redis/templates/metrics-svc.yaml
+++ b/bitnami/redis/templates/metrics-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "redis.fullname" . }}-metrics
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/networkpolicy.yaml b/bitnami/redis/templates/networkpolicy.yaml
index da055527cc..fb7568157e 100644
--- a/bitnami/redis/templates/networkpolicy.yaml
+++ b/bitnami/redis/templates/networkpolicy.yaml
@@ -3,6 +3,7 @@ kind: NetworkPolicy
 apiVersion: {{ template "networkPolicy.apiVersion" . }}
 metadata:
   name: {{ template "redis.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/prometheusrule.yaml b/bitnami/redis/templates/prometheusrule.yaml
index 500c3b37e7..b95594669a 100644
--- a/bitnami/redis/templates/prometheusrule.yaml
+++ b/bitnami/redis/templates/prometheusrule.yaml
@@ -3,9 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ template "redis.fullname" . }}
-{{- with .Values.metrics.prometheusRule.namespace }}
-  namespace: {{ . }}
-{{- end }}
+  {{- if .Values.metrics.prometheusRule.namespace }}
+  namespace: {{ .Values.metrics.prometheusRule.namespace }}
+  {{- else }}
+  namespace: {{ .Release.Namespace }}
+  {{- end }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/psp.yaml b/bitnami/redis/templates/psp.yaml
index 28ae22a775..08e0840853 100644
--- a/bitnami/redis/templates/psp.yaml
+++ b/bitnami/redis/templates/psp.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ template "podSecurityPolicy.apiVersion" . }}
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "redis.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/redis-master-statefulset.yaml b/bitnami/redis/templates/redis-master-statefulset.yaml
index b61c5391da..4c1d58311f 100755
--- a/bitnami/redis/templates/redis-master-statefulset.yaml
+++ b/bitnami/redis/templates/redis-master-statefulset.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "redis.fullname" . }}-master
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/redis-master-svc.yaml b/bitnami/redis/templates/redis-master-svc.yaml
index 3a98e667f0..6f9ae0db58 100644
--- a/bitnami/redis/templates/redis-master-svc.yaml
+++ b/bitnami/redis/templates/redis-master-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "redis.fullname" . }}-master
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/redis-role.yaml b/bitnami/redis/templates/redis-role.yaml
index 71f75ef78e..38d08e2f06 100644
--- a/bitnami/redis/templates/redis-role.yaml
+++ b/bitnami/redis/templates/redis-role.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ template "redis.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/redis-rolebinding.yaml b/bitnami/redis/templates/redis-rolebinding.yaml
index aceb258de6..3657f1454a 100644
--- a/bitnami/redis/templates/redis-rolebinding.yaml
+++ b/bitnami/redis/templates/redis-rolebinding.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ template "redis.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/redis-serviceaccount.yaml b/bitnami/redis/templates/redis-serviceaccount.yaml
index f027176600..5c9707f232 100644
--- a/bitnami/redis/templates/redis-serviceaccount.yaml
+++ b/bitnami/redis/templates/redis-serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "redis.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/redis-slave-statefulset.yaml b/bitnami/redis/templates/redis-slave-statefulset.yaml
index d5a8db5615..17d3aa6bb5 100755
--- a/bitnami/redis/templates/redis-slave-statefulset.yaml
+++ b/bitnami/redis/templates/redis-slave-statefulset.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "redis.fullname" . }}-slave
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/redis-slave-svc.yaml b/bitnami/redis/templates/redis-slave-svc.yaml
index 052ecea174..c29dcf4eb2 100644
--- a/bitnami/redis/templates/redis-slave-svc.yaml
+++ b/bitnami/redis/templates/redis-slave-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "redis.fullname" . }}-slave
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/redis-with-sentinel-svc.yaml b/bitnami/redis/templates/redis-with-sentinel-svc.yaml
index 5017c222a2..3c2de3d769 100644
--- a/bitnami/redis/templates/redis-with-sentinel-svc.yaml
+++ b/bitnami/redis/templates/redis-with-sentinel-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "redis.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/templates/secret.yaml b/bitnami/redis/templates/secret.yaml
index ead9c611a4..4c39ffdcd6 100644
--- a/bitnami/redis/templates/secret.yaml
+++ b/bitnami/redis/templates/secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "redis.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "redis.name" . }}
     chart: {{ template "redis.chart" . }}
diff --git a/bitnami/redis/values-production.yaml b/bitnami/redis/values-production.yaml
index 1c82165711..b7cf82ee7a 100644
--- a/bitnami/redis/values-production.yaml
+++ b/bitnami/redis/values-production.yaml
@@ -18,7 +18,7 @@ image:
   ## Bitnami Redis image tag
   ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
   ##
-  tag: 5.0.8-debian-10-r16
+  tag: 5.0.8-debian-10-r21
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -60,7 +60,7 @@ sentinel:
     ## Bitnami Redis image tag
     ## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links
     ##
-    tag: 5.0.8-debian-10-r13
+    tag: 5.0.8-debian-10-r17
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -480,7 +480,7 @@ metrics:
   image:
     registry: docker.io
     repository: bitnami/redis-exporter
-    tag: 1.5.2-debian-10-r9
+    tag: 1.5.2-debian-10-r13
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
diff --git a/bitnami/redis/values.yaml b/bitnami/redis/values.yaml
index d33ba4bdfe..f90b0307e5 100644
--- a/bitnami/redis/values.yaml
+++ b/bitnami/redis/values.yaml
@@ -18,7 +18,7 @@ image:
   ## Bitnami Redis image tag
   ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
   ##
-  tag: 5.0.8-debian-10-r16
+  tag: 5.0.8-debian-10-r21
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -60,7 +60,7 @@ sentinel:
     ## Bitnami Redis image tag
     ## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links
     ##
-    tag: 5.0.8-debian-10-r13
+    tag: 5.0.8-debian-10-r17
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -480,7 +480,7 @@ metrics:
   image:
     registry: docker.io
     repository: bitnami/redis-exporter
-    tag: 1.5.2-debian-10-r9
+    tag: 1.5.2-debian-10-r13
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.