diff --git a/bitnami/memcached/Chart.yaml b/bitnami/memcached/Chart.yaml
index 9d79523f23..b3148da9c2 100644
--- a/bitnami/memcached/Chart.yaml
+++ b/bitnami/memcached/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: memcached
-version: 2.1.5
+version: 2.1.6
 appVersion: 1.5.17
 description: Chart for Memcached
 keywords:
diff --git a/bitnami/memcached/README.md b/bitnami/memcached/README.md
index 1f92fbb829..179cec1ae6 100644
--- a/bitnami/memcached/README.md
+++ b/bitnami/memcached/README.md
@@ -66,6 +66,7 @@ The following tables lists the configurable parameters of the Memcached chart an
 | `serviceType`               | Kubernetes Service type                                                                                | `ClusterIP`                                             |
 | `resources`                 | CPU/Memory resource requests/limits                                                                    | Memory: `256Mi`, CPU: `250m`                            |
 | `clusterDomain`             | Kubernetes cluster domain                                                                              | `cluster.local`                                         |
+| `affinity`                  | Map of node/pod affinities                                                                             | `{}`                                                    |
 | `metrics.enabled`           | Start a side-car prometheus exporter                                                                   | `false`                                                 |
 | `metrics.image.registry`    | Memcached exporter image registry                                                                      | `docker.io`                                             |
 | `metrics.image.repository`  | Memcached exporter image name                                                                          | `bitnami/memcached-exporter`                            |
diff --git a/bitnami/memcached/templates/deployment.yaml b/bitnami/memcached/templates/deployment.yaml
index 5249e3e8d7..05b53d2f99 100644
--- a/bitnami/memcached/templates/deployment.yaml
+++ b/bitnami/memcached/templates/deployment.yaml
@@ -85,3 +85,7 @@ spec:
         resources:
   {{ toYaml .Values.metrics.resources | indent 10 }}
 {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
diff --git a/bitnami/memcached/values-production.yaml b/bitnami/memcached/values-production.yaml
index aa3ddee224..1abc210b3a 100644
--- a/bitnami/memcached/values-production.yaml
+++ b/bitnami/memcached/values-production.yaml
@@ -78,6 +78,11 @@ podAnnotations: {}
 # Cluster domain
 clusterDomain: cluster.local
 
+## Affinity for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}
+
 ## Prometheus Exporter / Metrics
 ##
 metrics:
diff --git a/bitnami/memcached/values.yaml b/bitnami/memcached/values.yaml
index 63eeb74b3f..11e2639ee0 100644
--- a/bitnami/memcached/values.yaml
+++ b/bitnami/memcached/values.yaml
@@ -78,6 +78,11 @@ podAnnotations: {}
 # Cluster domain
 clusterDomain: cluster.local
 
+## Affinity for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}
+
 ## Prometheus Exporter / Metrics
 ##
 metrics: