diff --git a/mongodb/Chart.yaml b/mongodb/Chart.yaml
index 3c8ce2857..2760629ed 100644
--- a/mongodb/Chart.yaml
+++ b/mongodb/Chart.yaml
@@ -2,7 +2,7 @@ name: mongodb
 home: https://mongodb.org
 source:
 - https://github.com/bitnami/bitnami-docker-mongodb
-version: 0.2.0
+version: 0.2.1
 description: Chart for MongoDB
 maintainers:
 - Bitnami <containers@bitnami.com>
diff --git a/mongodb/manifests/mongodb-rc.yaml b/mongodb/manifests/mongodb-rc.yaml
index ae1a891d4..28c62fef0 100644
--- a/mongodb/manifests/mongodb-rc.yaml
+++ b/mongodb/manifests/mongodb-rc.yaml
@@ -23,11 +23,17 @@ spec:
         image: bitnami/mongodb:3.2.7-r0
         env:
         - name: MONGODB_ROOT_PASSWORD
-          value: ""
+          valueFrom:
+            secretKeyRef:
+              name: mongodb
+              key: mongodb-root-password
         - name: MONGODB_USER
           value: ""
         - name: MONGODB_PASSWORD
-          value: ""
+          valueFrom:
+            secretKeyRef:
+              name: mongodb
+              key: mongodb-password
         - name: MONGODB_DATABASE
           value: ""
         ports:
diff --git a/mongodb/manifests/mongodb-secrets.yaml b/mongodb/manifests/mongodb-secrets.yaml
new file mode 100644
index 000000000..e48809bf7
--- /dev/null
+++ b/mongodb/manifests/mongodb-secrets.yaml
@@ -0,0 +1,12 @@
+#helm:generate helmc tpl -d tpl/values.toml -o manifests/mongodb-secrets.yaml $HELM_GENERATE_FILE
+apiVersion: v1
+kind: Secret
+metadata:
+  name: mongodb
+  labels:
+    provider: mongodb
+    heritage: bitnami
+type: Opaque
+data:
+  mongodb-root-password: ""
+  mongodb-password: ""
diff --git a/mongodb/tpl/mongodb-rc.yaml b/mongodb/tpl/mongodb-rc.yaml
index 2104d56f0..633294a5b 100644
--- a/mongodb/tpl/mongodb-rc.yaml
+++ b/mongodb/tpl/mongodb-rc.yaml
@@ -23,11 +23,17 @@ spec:
         image: bitnami/mongodb:3.2.7-r0
         env:
         - name: MONGODB_ROOT_PASSWORD
-          value: {{ .mongodbRootPassword | quote }}
+          valueFrom:
+            secretKeyRef:
+              name: mongodb
+              key: mongodb-root-password
         - name: MONGODB_USER
           value: {{ .mongodbUser | quote }}
         - name: MONGODB_PASSWORD
-          value: {{ .mongodbPassword | quote }}
+          valueFrom:
+            secretKeyRef:
+              name: mongodb
+              key: mongodb-password
         - name: MONGODB_DATABASE
           value: {{ .mongodbDatabase | quote }}
         ports:
diff --git a/mongodb/tpl/mongodb-secrets.yaml b/mongodb/tpl/mongodb-secrets.yaml
new file mode 100644
index 000000000..b0524fb72
--- /dev/null
+++ b/mongodb/tpl/mongodb-secrets.yaml
@@ -0,0 +1,12 @@
+#helm:generate helmc tpl -d tpl/values.toml -o manifests/mongodb-secrets.yaml $HELM_GENERATE_FILE
+apiVersion: v1
+kind: Secret
+metadata:
+  name: mongodb
+  labels:
+    provider: mongodb
+    heritage: bitnami
+type: Opaque
+data:
+  mongodb-root-password: {{ .mongodbRootPassword | b64enc | quote }}
+  mongodb-password: {{ .mongodbPassword | b64enc | quote }}