diff --git a/bitnami/mongodb-sharded/Chart.yaml b/bitnami/mongodb-sharded/Chart.yaml
index f789b1527..3f177d760 100644
--- a/bitnami/mongodb-sharded/Chart.yaml
+++ b/bitnami/mongodb-sharded/Chart.yaml
@@ -26,4 +26,4 @@ name: mongodb-sharded
 sources:
   - https://github.com/bitnami/bitnami-docker-mongodb-sharded
   - https://mongodb.org
-version: 5.0.17
+version: 5.1.0
diff --git a/bitnami/mongodb-sharded/templates/secrets.yaml b/bitnami/mongodb-sharded/templates/secrets.yaml
index cdbe3715a..adc300aa1 100644
--- a/bitnami/mongodb-sharded/templates/secrets.yaml
+++ b/bitnami/mongodb-sharded/templates/secrets.yaml
@@ -15,17 +15,13 @@ metadata:
 type: Opaque
 data:
   {{- if .Values.configsvr.external.rootPassword }}
-  mongodb-root-password: {{ .Values.configsvr.external.rootPassword | b64enc | quote }}
-  {{- else if .Values.auth.rootPassword }}
-  mongodb-root-password: {{ .Values.auth.rootPassword | b64enc | quote }}
+  mongodb-root-password: {{ include "common.secrets.passwords.manage" (dict "secret" (include "common.names.fullname" .) "key" "mongodb-root-password" "providedValues" (list "configsvr.external.rootPassword" ) "context" $) }}
   {{- else }}
-  mongodb-root-password: {{ randAlphaNum 10 | b64enc | quote }}
+  mongodb-root-password: {{ include "common.secrets.passwords.manage" (dict "secret" (include "common.names.fullname" .) "key" "mongodb-root-password" "providedValues" (list "auth.rootPassword" ) "context" $) }}
   {{- end }}
   {{- if .Values.configsvr.external.replicasetKey }}
-  mongodb-replica-set-key: {{ .Values.configsvr.external.replicasetKey | b64enc | quote }}
-  {{- else if .Values.auth.replicaSetKey }}
-  mongodb-replica-set-key: {{ .Values.auth.replicaSetKey | b64enc | quote }}
+  mongodb-replica-set-key: {{ include "common.secrets.passwords.manage" (dict "secret" (include "common.names.fullname" .) "key" "mongodb-replica-set-key" "providedValues" (list "configsvr.external.replicasetKey" ) "context" $) }}
   {{- else }}
-  mongodb-replica-set-key: {{ randAlphaNum 10 | b64enc | quote }}
+  mongodb-replica-set-key: {{ include "common.secrets.passwords.manage" (dict "secret" (include "common.names.fullname" .) "key" "mongodb-replica-set-key" "providedValues" (list "auth.replicaSetKey" ) "context" $) }}
   {{- end }}
 {{- end }}