diff --git a/stable/owncloud/Chart.yaml b/stable/owncloud/Chart.yaml
index 73e8cdbdee..14d7bb4841 100644
--- a/stable/owncloud/Chart.yaml
+++ b/stable/owncloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: owncloud
-version: 6.1.3
+version: 6.2.0
 appVersion: 10.2.1
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
diff --git a/stable/owncloud/README.md b/stable/owncloud/README.md
index a4700f2283..a5b672f9cf 100644
--- a/stable/owncloud/README.md
+++ b/stable/owncloud/README.md
@@ -95,6 +95,7 @@ The following table lists the configurable parameters of the ownCloud chart and
 | `persistence.owncloud.size`         | PVC Storage Request for ownCloud volume    | `8Gi`                                                   |
 | `resources`                         | CPU/Memory resource requests/limits        | Memory: `512Mi`, CPU: `300m`                            |
 | `podAnnotations`                    | Pod annotations                            | `{}`                                                    |
+| `affinity`                          | Map of node/pod affinities                 | `{}`                                                    |
 | `metrics.enabled`                   | Start a side-car prometheus exporter       | `false`                                                 |
 | `metrics.image.registry`            | Apache exporter image registry             | `docker.io`                                             |
 | `metrics.image.repository`          | Apache exporter image name                 | `bitnami/apache-exporter`                               |
diff --git a/stable/owncloud/templates/deployment.yaml b/stable/owncloud/templates/deployment.yaml
index 3d65fdb9c2..e960f15e41 100644
--- a/stable/owncloud/templates/deployment.yaml
+++ b/stable/owncloud/templates/deployment.yaml
@@ -142,4 +142,8 @@ spec:
       {{- else }}
         emptyDir: {}
       {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/stable/owncloud/values.yaml b/stable/owncloud/values.yaml
index d43863ca76..fd8b321610 100644
--- a/stable/owncloud/values.yaml
+++ b/stable/owncloud/values.yaml
@@ -230,6 +230,12 @@ resources:
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 ##
 podAnnotations: {}
+
+## Affinity for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}
+
 ## Prometheus Exporter / Metrics
 ##
 metrics: