diff --git a/charts/dbp-moodle/templates/_helpers.tpl b/charts/dbp-moodle/templates/_helpers.tpl
index 144e01f..0cadf32 100644
--- a/charts/dbp-moodle/templates/_helpers.tpl
+++ b/charts/dbp-moodle/templates/_helpers.tpl
@@ -31,8 +31,8 @@ false
 {{- default (randAlphaNum 16) .Values.dbpMoodle.secrets.moodle_password }}
 {{- end -}}
 
-{{- define "dbpMoodle.secrets.postgres_admin_password" -}}
-{{- default (randAlphaNum 16) .Values.dbpMoodle.secrets.postgres_admin_password }}
+{{- define "dbpMoodle.secrets.pgsql_admin_password" -}}
+{{- default (randAlphaNum 16) .Values.dbpMoodle.secrets.pgsql_admin_password }}
 {{- end -}}
 
 {{- define "dbpMoodle.secrets.mariadb_password" -}}
diff --git a/charts/dbp-moodle/templates/secrets/moodle-secret.yaml b/charts/dbp-moodle/templates/secrets/moodle-secret.yaml
index 827c388..f2fece5 100644
--- a/charts/dbp-moodle/templates/secrets/moodle-secret.yaml
+++ b/charts/dbp-moodle/templates/secrets/moodle-secret.yaml
@@ -9,7 +9,7 @@ stringData:
   moodle-password: {{ include "dbpMoodle.secrets.moodle_password" . }}
   {{- if .Values.postgresql.enabled }}
   mariadb-password: {{ include "dbpMoodle.secrets.mariadb_password" . }}
-  postgres-admin-password: {{ include "dbpMoodle.secrets.postgres_admin_password" . }}
+  pgsql-admin-password: {{ include "dbpMoodle.secrets.pgsql_admin_password" . }}
   {{- end }}
   {{- if .Values.mariadb.enabled }}
   mariadb-password: {{ include "dbpMoodle.secrets.mariadb_password" . }}
diff --git a/charts/dbp-moodle/values.yaml b/charts/dbp-moodle/values.yaml
index 2bc8032..662eabd 100644
--- a/charts/dbp-moodle/values.yaml
+++ b/charts/dbp-moodle/values.yaml
@@ -76,7 +76,7 @@ dbpMoodle:
   secrets:
     useChartSecret: false
     moodle_password: ""
-    postgres_admin_password: ""
+    pgsql_admin_password: ""
     mariadb_password: ""
     mariadb_root_password: ""
     etherpad_postgresql_password: ""
@@ -140,7 +140,7 @@ dbpMoodle:
     existingSecretKeyS3Secret: ""
     affinity: {}
     tolerations: []
-    
+
     rules:
       - apiGroups: ["apps"]
         resources: ["deployments/scale", "deployments"]
@@ -302,7 +302,7 @@ postgresql:
     database: "moodle"
     existingSecret: "moodle"
     secretKeys:
-      adminPasswordKey: "postgres-admin-password"
+      adminPasswordKey: "pgsql-admin-password"
       userPasswordKey: "mariadb-password" # moodle expects its db password key to be mariadb-password
   metrics:
     enabled: true