diff --git a/bitnami/common/Chart.yaml b/bitnami/common/Chart.yaml
index e43f7b05c..5608491e1 100644
--- a/bitnami/common/Chart.yaml
+++ b/bitnami/common/Chart.yaml
@@ -20,4 +20,4 @@ sources:
   - https://github.com/bitnami/charts
   - https://www.bitnami.com/
 type: library
-version: 1.16.0
\ No newline at end of file
+version: 1.16.1
diff --git a/bitnami/common/templates/_affinities.tpl b/bitnami/common/templates/_affinities.tpl
index 189ea403d..2387be262 100644
--- a/bitnami/common/templates/_affinities.tpl
+++ b/bitnami/common/templates/_affinities.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 
 {{/*
-Return a soft nodeAffinity definition 
+Return a soft nodeAffinity definition
 {{ include "common.affinities.nodes.soft" (dict "key" "FOO" "values" (list "BAR" "BAZ")) -}}
 */}}
 {{- define "common.affinities.nodes.soft" -}}
@@ -63,7 +63,7 @@ preferredDuringSchedulingIgnoredDuringExecution:
           {{ $key }}: {{ $value | quote }}
           {{- end }}
       namespaces:
-        - {{ .context.Release.Namespace | quote }}
+        - {{ include "common.names.namespace" .context | quote }}
       topologyKey: kubernetes.io/hostname
     weight: 1
 {{- end -}}
@@ -85,7 +85,7 @@ requiredDuringSchedulingIgnoredDuringExecution:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     namespaces:
-      - {{ .context.Release.Namespace | quote }}
+      - {{ include "common.names.namespace" .context | quote }}
     topologyKey: kubernetes.io/hostname
 {{- end -}}