diff --git a/stable/minio/Chart.yaml b/stable/minio/Chart.yaml
index 71baa4b3f1..e3b71c0d64 100755
--- a/stable/minio/Chart.yaml
+++ b/stable/minio/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Distributed object storage server built for cloud applications and devops.
 name: minio
-version: 0.5.0
+version: 0.5.1
 keywords:
 - storage
 - object-storage
diff --git a/stable/minio/README.md b/stable/minio/README.md
index d576ceb5b3..6ef56ac3fa 100644
--- a/stable/minio/README.md
+++ b/stable/minio/README.md
@@ -92,6 +92,8 @@ The following tables lists the configurable parameters of the Minio chart and th
 | `persistence.subPath`      | Mount a sub directory of the persistent volume if set | `""`                                  |
 | `resources`                | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `100m`                            |
 | `nodeSelector`             | Node labels for pod assignment      | `{}`                                                    |
+| `affinity`                 | Affinity settings for pod assignment | `{}`                                                   |
+| `tolerations`              | Toleration labels for pod assignment | `[]`                                                   |
 | `defaultBucket.enabled`    | If set to true, a bucket will be created after minio install | `false`                        |
 | `defaultBucket.name`       | Bucket name                         | `bucket`                                                |
 | `defaultBucket.policy`     | Bucket policy                       | `none`                                                  |
diff --git a/stable/minio/templates/minio_deployment.yaml b/stable/minio/templates/minio_deployment.yaml
index d341be3665..0b8f73baba 100644
--- a/stable/minio/templates/minio_deployment.yaml
+++ b/stable/minio/templates/minio_deployment.yaml
@@ -27,6 +27,14 @@ spec:
 {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
 {{- end }}
       volumes:
         - name: podinfo
diff --git a/stable/minio/templates/minio_statefulset.yaml b/stable/minio/templates/minio_statefulset.yaml
index bd07779ea5..53806d0c9d 100644
--- a/stable/minio/templates/minio_statefulset.yaml
+++ b/stable/minio/templates/minio_statefulset.yaml
@@ -46,6 +46,14 @@ spec:
 {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
 {{- end }}
       volumes:
         - name: minio-user
diff --git a/stable/minio/values.yaml b/stable/minio/values.yaml
index 558d397004..00ff3e0328 100644
--- a/stable/minio/values.yaml
+++ b/stable/minio/values.yaml
@@ -55,6 +55,8 @@ servicePort: 9000
 ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##
 nodeSelector: {}
+tolerations: []
+affinity: {}
 
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/