diff --git a/charts/incubator/awesome-ttrss/values.yaml b/charts/incubator/awesome-ttrss/values.yaml
index 279b45eff76..ba130cde0d7 100644
--- a/charts/incubator/awesome-ttrss/values.yaml
+++ b/charts/incubator/awesome-ttrss/values.yaml
@@ -25,16 +25,16 @@ persistence:
 env:
   # -- External URL you use to connect to the RSS (the one you enter in your browser)
   SELF_URL_PATH: ""
-  DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
-  DB_USER: "{{ .Values.postgresql.postgresqlUsername }}"
+  DB_NAME: "{{ .Values.cnpg.database }}"
+  DB_USER: "{{ .Values.cnpg.user }}"
   DB_PORT: "5432"
   DB_PASS:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: postgresql-password
   DB_HOST:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: plainhost
 
 service:
diff --git a/charts/incubator/briefkasten/values.yaml b/charts/incubator/briefkasten/values.yaml
index 06e5c6b0a12..75179996eeb 100644
--- a/charts/incubator/briefkasten/values.yaml
+++ b/charts/incubator/briefkasten/values.yaml
@@ -58,7 +58,7 @@ probes:
 
 postgresql:
   enabled: true
-  existingSecret: dbcreds
+  existingSecret: "dbcreds"
   postgresqlUsername: briefkasten
   postgresqlDatabase: briefkasten
 
diff --git a/charts/incubator/coupon-store/values.yaml b/charts/incubator/coupon-store/values.yaml
index 302be32065c..e1b976cc4ce 100644
--- a/charts/incubator/coupon-store/values.yaml
+++ b/charts/incubator/coupon-store/values.yaml
@@ -28,7 +28,7 @@ service:
 
 postgresql:
   enabled: true
-  existingSecret: dbcreds
+  existingSecret: "dbcreds"
   postgresqlUsername: coupon-store
   postgresqlDatabase: coupon-store
 
diff --git a/charts/incubator/docspell/values.yaml b/charts/incubator/docspell/values.yaml
index e1da47592e7..39c27dbc139 100644
--- a/charts/incubator/docspell/values.yaml
+++ b/charts/incubator/docspell/values.yaml
@@ -536,7 +536,7 @@ persistence:
     mountPath: /import
 postgresql:
   enabled: true
-  existingSecret: dbcreds
+  existingSecret: "dbcreds"
   postgresqlUsername: docspell
   postgresqlDatabase: docspell
 
diff --git a/charts/incubator/etesync/values.yaml b/charts/incubator/etesync/values.yaml
index 0f5a377a33c..464bb805bd2 100644
--- a/charts/incubator/etesync/values.yaml
+++ b/charts/incubator/etesync/values.yaml
@@ -30,15 +30,15 @@ env:
 
   # Postgres
   DB_ENGINE: postgres
-  DATABASE_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
-  DATABASE_USER: "{{ .Values.postgresql.postgresqlUsername }}"
+  DATABASE_NAME: "{{ .Values.cnpg.database }}"
+  DATABASE_USER: "{{ .Values.cnpg.user }}"
   DATABASE_PASSWORD:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: postgresql-password
   DATABASE_HOST:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: plainhost
   DATABASE_PORT: 5432
   REDIS_URI:
diff --git a/charts/incubator/lenpaste/values.yaml b/charts/incubator/lenpaste/values.yaml
index 5f2fb8ac58d..24fe4235d54 100644
--- a/charts/incubator/lenpaste/values.yaml
+++ b/charts/incubator/lenpaste/values.yaml
@@ -8,7 +8,7 @@ env:
   LENPASTE_DB_DRIVER: postgres
   LENPASTE_DB_SOURCE:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: urlnossl
   # User Defined
   LENPASTE_ADMIN_NAME: admin
@@ -33,7 +33,7 @@ persistence:
 
 postgresql:
   enabled: true
-  existingSecret: dbcreds
+  existingSecret: "dbcreds"
   postgresqlUsername: lenpaste
   postgresqlDatabase: lenpaste
 
diff --git a/charts/incubator/midarr/values.yaml b/charts/incubator/midarr/values.yaml
index aaa96c1dec6..4b41642fbf2 100644
--- a/charts/incubator/midarr/values.yaml
+++ b/charts/incubator/midarr/values.yaml
@@ -43,7 +43,7 @@ service:
 
 postgresql:
   enabled: true
-  existingSecret: dbcreds
+  existingSecret: "dbcreds"
   postgresqlUsername: midarr
   postgresqlDatabase: midarr
 
diff --git a/charts/incubator/netbox/values.yaml b/charts/incubator/netbox/values.yaml
index e1e8e67c688..61fd6edaa73 100644
--- a/charts/incubator/netbox/values.yaml
+++ b/charts/incubator/netbox/values.yaml
@@ -256,7 +256,7 @@ persistence:
 
 postgresql:
   enabled: true
-  existingSecret: dbcreds
+  existingSecret: "dbcreds"
   postgresqlUsername: netbox
   postgresqlDatabase: netbox
 
diff --git a/charts/incubator/openproject/values.yaml b/charts/incubator/openproject/values.yaml
index 1e5b54b19f1..371d7590f53 100644
--- a/charts/incubator/openproject/values.yaml
+++ b/charts/incubator/openproject/values.yaml
@@ -18,7 +18,7 @@ env:
       key: SECRET_KEY_BASE
   DATABASE_URL:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: url-noql
 
 persistence:
diff --git a/charts/incubator/plausible/values.yaml b/charts/incubator/plausible/values.yaml
index 5d251cf336d..b6725762018 100644
--- a/charts/incubator/plausible/values.yaml
+++ b/charts/incubator/plausible/values.yaml
@@ -102,7 +102,7 @@ probes:
 
 postgresql:
   enabled: true
-  existingSecret: dbcreds
+  existingSecret: "dbcreds"
   postgresqlUsername: plausible
   postgresqlDatabase: plausible
 
diff --git a/charts/incubator/plik/values.yaml b/charts/incubator/plik/values.yaml
index d27cc3076d1..f69d644f64f 100644
--- a/charts/incubator/plik/values.yaml
+++ b/charts/incubator/plik/values.yaml
@@ -96,7 +96,7 @@ persistence:
 
 postgresql:
   enabled: true
-  existingSecret: dbcreds
+  existingSecret: "dbcreds"
   postgresqlUsername: plik
   postgresqlDatabase: plik
 
diff --git a/charts/incubator/sheetable/values.yaml b/charts/incubator/sheetable/values.yaml
index 3bf25d4d64a..993aa186853 100644
--- a/charts/incubator/sheetable/values.yaml
+++ b/charts/incubator/sheetable/values.yaml
@@ -20,15 +20,15 @@ env:
   CONFIG_PATH: "/app/config/"
   DB_DRIVER: "postgres"
   DB_PORT: "5432"
-  DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
-  DB_USER: "{{ .Values.postgresql.postgresqlUsername }}"
+  DB_NAME: "{{ .Values.cnpg.database }}"
+  DB_USER: "{{ .Values.cnpg.user }}"
   DB_HOST:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: plainhost
   DB_PASSWORD:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: postgresql-password
   API_SECRET:
     secretKeyRef:
diff --git a/charts/incubator/speedtest-tracker/values.yaml b/charts/incubator/speedtest-tracker/values.yaml
index e2454e66a66..73d3745d6a2 100644
--- a/charts/incubator/speedtest-tracker/values.yaml
+++ b/charts/incubator/speedtest-tracker/values.yaml
@@ -14,15 +14,15 @@ podSecurityContext:
 env:
   DB_CONNECTION: pgsql
   DB_PORT: 5432
-  DB_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}"
-  DB_USERNAME: "{{ .Values.postgresql.postgresqlUsername }}"
+  DB_DATABASE: "{{ .Values.cnpg.database }}"
+  DB_USERNAME: "{{ .Values.cnpg.user }}"
   DB_HOST:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: plainhost
   DB_PASSWORD:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: postgresql-password
 
 service:
@@ -40,7 +40,7 @@ persistence:
 
 postgresql:
   enabled: true
-  existingSecret: dbcreds
+  existingSecret: "dbcreds"
   postgresqlDatabase: speedtest_tracker
   postgresqlUsername: speedtest_tracker
 
diff --git a/charts/incubator/umami/values.yaml b/charts/incubator/umami/values.yaml
index 6a3e2e78290..1a9db2df150 100644
--- a/charts/incubator/umami/values.yaml
+++ b/charts/incubator/umami/values.yaml
@@ -33,7 +33,7 @@ env:
   DATABASE_TYPE: postgresql
   DATABASE_URL:
     secretKeyRef:
-      name: dbcreds
+      name: cnpg-main-urls
       key: url
   FORCE_SSL: '{{ ternary "1" "0" .Values.umami.force_ssl }}'
   HOSTNAME: "{{ .Values.umami.hostname }}"