diff --git a/postgresql/templates/secret.yaml b/postgresql/templates/secret.yaml
index 8902daac9e2009e7d92e2ba2919cf557e2864e75..91454e5ae0eb69b75abd4774930ae2183cb6792e 100644
--- a/postgresql/templates/secret.yaml
+++ b/postgresql/templates/secret.yaml
@@ -9,13 +9,13 @@ metadata:
     {{- include "postgresql-helm.labels" . | nindent 4 }}
 type: Opaque
 data:
-  {{ if empty .Values.postgresqlPassword }}
+  {{ if empty .Values.postgresPassword }}
   # retrieve the secret data using lookup function and when not exists, return an empty dictionary / map as result
   {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace $fullname) | default dict }}
   {{- $secretData := (get $secretObj "data") | default dict }}
   # set $secret to existing secret data or generate a random one when not exists
   {{- $secretValue := (get $secretData $fullname) | default (randAlphaNum 48 | b64enc) }}
-  postgresql-password: {{ $secretValue | quote }}
+  postgres-password: {{ $secretValue | quote }}
   {{ else }}
-  postgresql-password: "{{ .Values.postgresqlPassword }}"
+  postgres-password: "{{ .Values.postgresPassword }}"
   {{ end }}
\ No newline at end of file
diff --git a/postgresql/templates/statefulset.yaml b/postgresql/templates/statefulset.yaml
index 94afc71153d4947565d0f114e259432289729ba0..4dca6e43fa44091cd777ffa2faaf768c83119818 100644
--- a/postgresql/templates/statefulset.yaml
+++ b/postgresql/templates/statefulset.yaml
@@ -47,10 +47,10 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            - name: postgresql_PASSWORD
+            - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: "postgresql-password"
+                  key: "postgres-password"
                   name: {{ include "postgresql-helm.fullname" . }}
           ports:
             - name: sql
diff --git a/postgresql/values.yaml b/postgresql/values.yaml
index 31a606da379bb88c360f20716ea90d01e5b849ec..712b129ebdff151759df548864839842364d0f77 100644
--- a/postgresql/values.yaml
+++ b/postgresql/values.yaml
@@ -13,7 +13,7 @@ volume: |-
   emptyDir: {}
 
 # if left empty, one will be auto-generated
-postgresqlPassword: ""
+postgresPassword: ""
 
 tls:
   enabled: false