diff --git a/upstreamed/drupal/Chart.yaml b/upstreamed/drupal/Chart.yaml
index 76628153e..179dd5289 100644
--- a/upstreamed/drupal/Chart.yaml
+++ b/upstreamed/drupal/Chart.yaml
@@ -1,6 +1,6 @@
 name: drupal
-version: 3.0.5
-appVersion: 8.6.8
+version: 3.0.6
+appVersion: 8.6.9
 description: One of the most versatile open source content management systems.
 keywords:
 - drupal
diff --git a/upstreamed/drupal/values.yaml b/upstreamed/drupal/values.yaml
index beb290cbd..1e953f6b2 100644
--- a/upstreamed/drupal/values.yaml
+++ b/upstreamed/drupal/values.yaml
@@ -10,7 +10,7 @@
 image:
   registry: docker.io
   repository: bitnami/drupal
-  tag: 8.6.8
+  tag: 8.6.9
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml
index f762d1cdb..760f5ec1d 100644
--- a/upstreamed/mongodb/Chart.yaml
+++ b/upstreamed/mongodb/Chart.yaml
@@ -1,5 +1,5 @@
 name: mongodb
-version: 5.3.2
+version: 5.3.3
 appVersion: 4.0.6
 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
 keywords:
diff --git a/upstreamed/mongodb/templates/svc-primary-rs.yaml b/upstreamed/mongodb/templates/svc-primary-rs.yaml
index ccc73ecb3..e51438490 100644
--- a/upstreamed/mongodb/templates/svc-primary-rs.yaml
+++ b/upstreamed/mongodb/templates/svc-primary-rs.yaml
@@ -14,9 +14,9 @@ metadata:
 {{- end }}
 spec:
   type: {{ .Values.service.type }}
-   {{- if and (eq .Values.service.type "ClusterIP") .Values.service.clusterIP }}
-   clusterIP: {{ .Values.service.clusterIP }}
-   {{- end }}
+  {{- if and (eq .Values.service.type "ClusterIP") .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{- end }}
   ports:
   - name: mongodb
     port: 27017
diff --git a/upstreamed/postgresql/Chart.yaml b/upstreamed/postgresql/Chart.yaml
index 6bb649cb3..7675f70b3 100644
--- a/upstreamed/postgresql/Chart.yaml
+++ b/upstreamed/postgresql/Chart.yaml
@@ -1,5 +1,5 @@
 name: postgresql
-version: 3.10.1
+version: 3.10.2
 appVersion: 10.6.0
 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
 keywords:
diff --git a/upstreamed/postgresql/templates/statefulset-slaves.yaml b/upstreamed/postgresql/templates/statefulset-slaves.yaml
index b3eb95aed..464e5f9ba 100644
--- a/upstreamed/postgresql/templates/statefulset-slaves.yaml
+++ b/upstreamed/postgresql/templates/statefulset-slaves.yaml
@@ -26,11 +26,6 @@ spec:
         heritage: {{ .Release.Service | quote }}
         role: slave
     spec:
-      {{- if .Values.securityContext.enabled }}
-      securityContext:
-        fsGroup: {{ .Values.securityContext.fsGroup }}
-        runAsUser: {{ .Values.securityContext.runAsUser }}
-      {{- end }}
       {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
       {{- range .Values.image.pullSecrets }}
@@ -79,6 +74,11 @@ spec:
         imagePullPolicy: "{{ .Values.image.pullPolicy }}"
         resources:
 {{ toYaml .Values.resources | indent 10 }}
+        {{- if .Values.securityContext.enabled }}
+        securityContext:
+          fsGroup: {{ .Values.securityContext.fsGroup }}
+          runAsUser: {{ .Values.securityContext.runAsUser }}
+        {{- end }}
         env:
         {{- if .Values.image.debug}}
         - name: BASH_DEBUG
diff --git a/upstreamed/postgresql/templates/statefulset.yaml b/upstreamed/postgresql/templates/statefulset.yaml
index 80d9c2855..1bd7d1e85 100644
--- a/upstreamed/postgresql/templates/statefulset.yaml
+++ b/upstreamed/postgresql/templates/statefulset.yaml
@@ -27,11 +27,6 @@ spec:
         heritage: {{ .Release.Service | quote }}
         role: master
     spec:
-      {{- if .Values.securityContext.enabled }}
-      securityContext:
-        fsGroup: {{ .Values.securityContext.fsGroup }}
-        runAsUser: {{ .Values.securityContext.runAsUser }}
-      {{- end }}
       {{- if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets }}
       imagePullSecrets:
       {{- range .Values.image.pullSecrets }}
@@ -83,6 +78,11 @@ spec:
         imagePullPolicy: "{{ .Values.image.pullPolicy }}"
         resources:
 {{ toYaml .Values.resources | indent 10 }}
+        {{- if .Values.securityContext.enabled }}
+        securityContext:
+          fsGroup: {{ .Values.securityContext.fsGroup }}
+          runAsUser: {{ .Values.securityContext.runAsUser }}
+        {{- end }}
         env:
         {{- if .Values.image.debug}}
         - name: BASH_DEBUG