diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml
index 559dc5c8a..d3049476f 100644
--- a/upstreamed/mongodb/Chart.yaml
+++ b/upstreamed/mongodb/Chart.yaml
@@ -1,5 +1,5 @@
 name: mongodb
-version: 4.0.0
+version: 4.0.1
 appVersion: 3.6.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/statefulset-secondary-rs.yaml b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml
index 4289e374e..b30f8095a 100644
--- a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml
@@ -24,6 +24,11 @@ spec:
         release: {{ .Release.Name }}
         component: secondary
     spec:
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+        runAsUser: {{ .Values.securityContext.runAsUser }}
+      {{- end }}
       {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
       {{- range .Values.image.pullSecrets }}
@@ -125,4 +130,4 @@ spec:
         - name: datadir
           emptyDir: {}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml
index ab97c3776..853ca1c76 100644
--- a/upstreamed/rabbitmq/Chart.yaml
+++ b/upstreamed/rabbitmq/Chart.yaml
@@ -1,5 +1,5 @@
 name: rabbitmq
-version: 2.0.0
+version: 2.0.1
 appVersion: 3.7.6
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
diff --git a/upstreamed/rabbitmq/values-production.yaml b/upstreamed/rabbitmq/values-production.yaml
index 21c50cf4e..d4ad72254 100644
--- a/upstreamed/rabbitmq/values-production.yaml
+++ b/upstreamed/rabbitmq/values-production.yaml
@@ -4,7 +4,7 @@
 image:
   registry: docker.io
   repository: bitnami/rabbitmq
-  tag: 3.7.6-ol-7-r1
+  tag: 3.7.7
   ## 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/rabbitmq/values.yaml b/upstreamed/rabbitmq/values.yaml
index 2b04dfc11..f36160c53 100644
--- a/upstreamed/rabbitmq/values.yaml
+++ b/upstreamed/rabbitmq/values.yaml
@@ -4,7 +4,7 @@
 image:
   registry: docker.io
   repository: bitnami/rabbitmq
-  tag: 3.7.6-ol-7
+  tag: 3.7.7
 
   ## set to true if you would like to see extra information on logs
   ## it turns BASH and NAMI debugging in minideb