diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..9eec1933b
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,4 @@
+# CODEOWNERS
+# Last-match-wins: put broader patterns above more specific ones.
+# Docs: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+/.github/CODEOWNERS        @flamingo-stack/devops-engineers
diff --git a/charts/meshcentral/templates/configmap.yaml b/charts/meshcentral/templates/configmap.yaml
index 270007434..67a489081 100644
--- a/charts/meshcentral/templates/configmap.yaml
+++ b/charts/meshcentral/templates/configmap.yaml
@@ -20,6 +20,7 @@ metadata:
   labels:
     {{- include "meshcentral.labels" . | nindent 4 }}
 data:
+  MC_MONGO_USER: {{ .Values.mongodb.userValue | quote }}
   MC_MONGO_HOSTS: {{ .Values.mongodb.hostsValue | quote }}
   MC_MONGO_DATABASE: {{ .Values.mongodb.databaseValue | quote }}
   MC_MONGO_AUTH_SOURCE: {{ .Values.mongodb.authSourceValue | quote }}
diff --git a/charts/meshcentral/templates/secrets.yaml b/charts/meshcentral/templates/secrets.yaml
index f990711da..b165f01c2 100644
--- a/charts/meshcentral/templates/secrets.yaml
+++ b/charts/meshcentral/templates/secrets.yaml
@@ -22,7 +22,6 @@ metadata:
     {{- include "meshcentral.labels" . | nindent 4 }}
 type: Opaque
 stringData:
-  MC_MONGO_USER: {{ .Values.mongodb.userValue | quote }}
   MC_MONGO_PASSWORD: {{ .Values.mongodb.passwordValue | quote }}
 {{- end }}
 
diff --git a/charts/meshcentral/values.yaml b/charts/meshcentral/values.yaml
index 05026f77f..98e55d886 100644
--- a/charts/meshcentral/values.yaml
+++ b/charts/meshcentral/values.yaml
@@ -52,15 +52,16 @@ credentials:
 #   1. existingX: ""           → chart creates "{Chart.Name}-mongodb-creds" / "-config"
 #                                 from the *Value fields below. Dev/test only.
 #   2. existingX: "<name>"     → chart references that resource. Required keys:
-#                                 Secret    → MC_MONGO_USER, MC_MONGO_PASSWORD
-#                                 ConfigMap → MC_MONGO_HOSTS, MC_MONGO_DATABASE,
-#                                             MC_MONGO_AUTH_SOURCE, MC_MONGO_REPLICA_SET
+#                                 Secret    → MC_MONGO_PASSWORD
+#                                 ConfigMap → MC_MONGO_USER, MC_MONGO_HOSTS,
+#                                             MC_MONGO_DATABASE, MC_MONGO_AUTH_SOURCE,
+#                                             MC_MONGO_REPLICA_SET
 mongodb:
   existingSecret: ""
-  userValue: ""
   passwordValue: ""
 
   existingConfigMap: ""
+  userValue: ""
   hostsValue: ""
   databaseValue: "meshcentral"
   authSourceValue: "admin"