diff --git a/charts/stable/meshcentral/Chart.yaml b/charts/stable/meshcentral/Chart.yaml
index 2dee80cb105..40dec0a0f88 100644
--- a/charts/stable/meshcentral/Chart.yaml
+++ b/charts/stable/meshcentral/Chart.yaml
@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0"
 apiVersion: v2
 name: meshcentral
-version: 11.0.15
+version: 12.0.0
 appVersion: 1.1.16
 description: MeshCentral is a full computer management web site
 home: https://truecharts.org/charts/stable/meshcentral
@@ -27,13 +27,6 @@ dependencies:
     alias: ""
     tags: []
     import-values: []
-  - name: mongodb
-    version: 6.0.67
-    repository: https://deps.truecharts.org/
-    condition: mongodb.enabled
-    alias: ""
-    tags: []
-    import-values: []
 annotations:
   max_scale_version: 23.10.1
   min_scale_version: 22.12.4
diff --git a/charts/stable/meshcentral/templates/_secret.tpl b/charts/stable/meshcentral/templates/_secret.tpl
index 4709820c8a5..dd6451341b1 100644
--- a/charts/stable/meshcentral/templates/_secret.tpl
+++ b/charts/stable/meshcentral/templates/_secret.tpl
@@ -43,8 +43,12 @@
   {{- $_ := set $config "settings" dict -}}
 {{- end -}}
 
-{{- $_ := set $config.settings "mongoDB" (.Values.mongodb.creds.complete | trimAll "\"") -}}
-{{- $_ := set $config.settings "mongoDbName" .Values.mongodb.mongodbDatabase -}}
+{{- $_ := set $config.settings "postgres" dict -}}
+{{- $_ := set $config.settings.postgres "database" .Values.cnpg.main.database -}}
+{{- $_ := set $config.settings.postgres "user" .Values.cnpg.main.user -}}
+{{- $_ := set $config.settings.postgres "host" (.Values.cnpg.main.creds.host | trimAll "\"") -}}
+{{- $_ := set $config.settings.postgres "port" 5432 -}}
+{{- $_ := set $config.settings.postgres "password" (.Values.cnpg.main.creds.password | trimAll "\"") -}}
 {{- $_ := set $config.settings "sessionKey" $sessionKey -}}
 {{- $_ := set $config.settings "port" .Values.service.main.ports.main.port -}}
 
diff --git a/charts/stable/meshcentral/values.yaml b/charts/stable/meshcentral/values.yaml
index 11ad1ad8b9a..067343b5c73 100644
--- a/charts/stable/meshcentral/values.yaml
+++ b/charts/stable/meshcentral/values.yaml
@@ -23,7 +23,6 @@ securityContext:
 # - Any service that uses port other than 443, need to be manually configured.
 meshcentral:
   settings:
-    mongoDbBulkOperations: true
     # - The actual main port as seen externally on the Internet, this setting is often used when a reverse-proxy is used.
     aliasPort: 443
     # - When set, relayPort value is ignored. Set this to a DNS name the points to this server. When the server is accessed using the DNS name, the main web server port is used as a web relay port.
@@ -967,10 +966,11 @@ service:
   #       enabled: true
   #       port: 9971
   #       targetPort: 9971
-mongodb:
-  enabled: true
-  mongodbUsername: meshcentral
-  mongodbDatabase: meshcentral
+cnpg:
+  main:
+    enabled: true
+    username: meshcentral
+    database: meshcentral
 persistence:
   data:
     enabled: true