diff --git a/bitnami/mysql/Chart.yaml b/bitnami/mysql/Chart.yaml
index fc9286cb8..6a211bb61 100644
--- a/bitnami/mysql/Chart.yaml
+++ b/bitnami/mysql/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mysql
-version: 6.3.4
+version: 6.3.5
 appVersion: 8.0.17
 description: Chart to create a Highly available MySQL cluster
 keywords:
diff --git a/bitnami/mysql/README.md b/bitnami/mysql/README.md
index 8798b4eb3..4acdb72ae 100644
--- a/bitnami/mysql/README.md
+++ b/bitnami/mysql/README.md
@@ -127,6 +127,7 @@ The following tables lists the configurable parameters of the MySQL chart and th
 | `slave.readinessProbe.timeoutSeconds`       | When the probe times out (slave)                                                                                                                          | `1`                                                               |
 | `slave.readinessProbe.successThreshold`     | Minimum consecutive successes for the probe (slave)                                                                                                       | `1`                                                               |
 | `slave.readinessProbe.failureThreshold`     | Minimum consecutive failures for the probe (slave)                                                                                                        | `3`                                                               |
+| `affinity`                                  | Map of node/pod affinities                                                                                                                                | `{}`                                                              |
 | `metrics.enabled`                           | Start a side-car prometheus exporter                                                                                                                      | `false`                                                           |
 | `metrics.image`                             | Exporter image name                                                                                                                                       | `bitnami/mysqld-exporter`                                         |
 | `metrics.imageTag`                          | Exporter image tag                                                                                                                                        | `{TAG_NAME}`                                                      |
diff --git a/bitnami/mysql/templates/master-statefulset.yaml b/bitnami/mysql/templates/master-statefulset.yaml
index 80b547629..7342c02a7 100644
--- a/bitnami/mysql/templates/master-statefulset.yaml
+++ b/bitnami/mysql/templates/master-statefulset.yaml
@@ -219,3 +219,7 @@ spec:
         - name: "data"
           emptyDir: {}
 {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
diff --git a/bitnami/mysql/templates/slave-statefulset.yaml b/bitnami/mysql/templates/slave-statefulset.yaml
index 842835263..d573eaf51 100644
--- a/bitnami/mysql/templates/slave-statefulset.yaml
+++ b/bitnami/mysql/templates/slave-statefulset.yaml
@@ -196,3 +196,7 @@ spec:
           emptyDir: {}
 {{- end }}
 {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
diff --git a/bitnami/mysql/values-production.yaml b/bitnami/mysql/values-production.yaml
index f8190cd0b..8f180e18d 100644
--- a/bitnami/mysql/values-production.yaml
+++ b/bitnami/mysql/values-production.yaml
@@ -288,6 +288,11 @@ slave:
     successThreshold: 1
     failureThreshold: 3
 
+## Affinity for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}
+
 metrics:
   enabled: true
   image:
diff --git a/bitnami/mysql/values.yaml b/bitnami/mysql/values.yaml
index 596def2d8..7d05a4a9e 100644
--- a/bitnami/mysql/values.yaml
+++ b/bitnami/mysql/values.yaml
@@ -288,6 +288,11 @@ slave:
     successThreshold: 1
     failureThreshold: 3
 
+## Affinity for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}
+
 metrics:
   enabled: false
   image: