diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml
index e40150faa..26283c07a 100644
--- a/upstreamed/mongodb/Chart.yaml
+++ b/upstreamed/mongodb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mongodb
-version: 6.1.1
+version: 6.1.2
 appVersion: 4.0.10
 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/deployment-standalone.yaml b/upstreamed/mongodb/templates/deployment-standalone.yaml
index fa1991d9e..0f9156e57 100644
--- a/upstreamed/mongodb/templates/deployment-standalone.yaml
+++ b/upstreamed/mongodb/templates/deployment-standalone.yaml
@@ -70,8 +70,8 @@ spec:
         {{- end }}
         env:
         {{- if .Values.image.debug}}
-        - name: NAMI_DEBUG
-          value: "1"
+        - name: BITNAMI_DEBUG
+          value: "true"
         {{- end }}
         {{- if .Values.usePassword }}
         {{- if and .Values.mongodbUsername .Values.mongodbDatabase }}
diff --git a/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml b/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml
index 3877b3aa0..35ed641e9 100644
--- a/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml
@@ -77,8 +77,8 @@ spec:
             name: mongodb
           env:
           {{- if .Values.image.debug}}
-          - name: NAMI_DEBUG
-            value: "1"
+          - name: BITNAMI_DEBUG
+            value: "true"
           {{- end }}
           - name: MONGODB_SYSTEM_LOG_VERBOSITY
             value: {{ .Values.mongodbSystemLogVerbosity | quote }}
diff --git a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml
index 1c3132e2c..ae25970dd 100644
--- a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml
@@ -82,8 +82,8 @@ spec:
             name: mongodb
           env:
           {{- if .Values.image.debug}}
-          - name: NAMI_DEBUG
-            value: "1"
+          - name: BITNAMI_DEBUG
+            value: "true"
           {{- end }}
           - name: MONGODB_SYSTEM_LOG_VERBOSITY
             value: {{ .Values.mongodbSystemLogVerbosity | quote }}
diff --git a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml
index 678db231e..70f0cb3fb 100644
--- a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml
@@ -83,8 +83,8 @@ spec:
             name: mongodb
           env:
           {{- if .Values.image.debug}}
-          - name: NAMI_DEBUG
-            value: "1"
+          - name: BITNAMI_DEBUG
+            value: "true"
           {{- end }}
           - name: MONGODB_SYSTEM_LOG_VERBOSITY
             value: {{ .Values.mongodbSystemLogVerbosity | quote }}
diff --git a/upstreamed/mongodb/values-production.yaml b/upstreamed/mongodb/values-production.yaml
index 7a42a062a..8f36371f7 100644
--- a/upstreamed/mongodb/values-production.yaml
+++ b/upstreamed/mongodb/values-production.yaml
@@ -30,8 +30,8 @@ image:
   #   - myRegistryKeySecretName
 
   ## Set to true if you would like to see extra information on logs
-  ## It turns NAMI debugging in minideb
-  ## ref:  https://github.com/bitnami/minideb-extras/#turn-on-nami-debugging
+  ## It turns on Bitnami debugging in minideb-extras-base
+  ## ref:  https://github.com/bitnami/minideb-extras-base
   debug: false
 
 ## String to partially override mongodb.fullname template (will maintain the release name)
diff --git a/upstreamed/mongodb/values.yaml b/upstreamed/mongodb/values.yaml
index 6ebbe4d11..fd3cd9496 100644
--- a/upstreamed/mongodb/values.yaml
+++ b/upstreamed/mongodb/values.yaml
@@ -30,8 +30,8 @@ image:
   #   - myRegistryKeySecretName
 
   ## Set to true if you would like to see extra information on logs
-  ## It turns NAMI debugging in minideb
-  ## ref:  https://github.com/bitnami/minideb-extras/#turn-on-nami-debugging
+  ## It turns on Bitnami debugging in minideb-extras-base
+  ## ref:  https://github.com/bitnami/minideb-extras-base
   debug: false
 
 ## String to partially override mongodb.fullname template (will maintain the release name)