diff --git a/upstreamed/phpbb/Chart.yaml b/upstreamed/phpbb/Chart.yaml
index 6d6bf50c7c..0e9f423352 100644
--- a/upstreamed/phpbb/Chart.yaml
+++ b/upstreamed/phpbb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: phpbb
-version: 6.1.3
+version: 6.2.0
 appVersion: 3.2.7
 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more.
 keywords:
diff --git a/upstreamed/phpbb/README.md b/upstreamed/phpbb/README.md
index 682e8d0126..717c981441 100644
--- a/upstreamed/phpbb/README.md
+++ b/upstreamed/phpbb/README.md
@@ -101,6 +101,7 @@ The following table lists the configurable parameters of the phpBB chart and the
 | `persistence.phpbb.size`          | PVC Storage Request for phpBB 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/upstreamed/phpbb/templates/deployment.yaml b/upstreamed/phpbb/templates/deployment.yaml
index 5d11b656ec..10e4d2c849 100644
--- a/upstreamed/phpbb/templates/deployment.yaml
+++ b/upstreamed/phpbb/templates/deployment.yaml
@@ -159,4 +159,8 @@ spec:
       {{- else }}
         emptyDir: {}
       {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/upstreamed/phpbb/values.yaml b/upstreamed/phpbb/values.yaml
index bf60965097..c989905fc4 100644
--- a/upstreamed/phpbb/values.yaml
+++ b/upstreamed/phpbb/values.yaml
@@ -233,6 +233,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: