diff --git a/templates/postgres-config-override-configmap.yaml b/templates/postgres-config-override-configmap.yaml
index 99e7ca9..697bce1 100644
--- a/templates/postgres-config-override-configmap.yaml
+++ b/templates/postgres-config-override-configmap.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: "{{ template "concourse.postgresql.fullname" . }}-config-override"
   {{- if .Values.postgresql.configMapAnnotations }}
-  annotations: "{{ toYaml .Values.postgresql.annotations | nindent 4 }}"
+  annotations: "{{ toYaml .Values.postgresql.configMapAnnotations | nindent 4 }}"
   {{- end }}
   labels:
     app: {{ template "concourse.postgresql.fullname" . }}
diff --git a/templates/postgres-env-configmap.yaml b/templates/postgres-env-configmap.yaml
index 853b790..738b721 100644
--- a/templates/postgres-env-configmap.yaml
+++ b/templates/postgres-env-configmap.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: "{{ template "concourse.postgresql.fullname" . }}-env"
   {{- if .Values.postgresql.configMapAnnotations }}
-  annotations: "{{ toYaml .Values.postgresql.annotations | nindent 4 }}"
+  annotations: "{{ toYaml .Values.postgresql.configMapAnnotations | nindent 4 }}"
   {{- end }}
   labels:
     app: {{ template "concourse.postgresql.fullname" . }}
diff --git a/templates/postgres-secret.yaml b/templates/postgres-secret.yaml
index 0ba8737..e650d1e 100644
--- a/templates/postgres-secret.yaml
+++ b/templates/postgres-secret.yaml
@@ -4,7 +4,7 @@ kind: Secret
 metadata:
   name: "{{ template "concourse.postgresql.fullname" . }}-connection"
   {{- if .Values.postgresql.secretAnnotations }}
-  annotations: "{{ toYaml .Values.postgresql.primary.annotations | nindent 4 }}"
+  annotations: "{{ toYaml .Values.postgresql.secretAnnotations | nindent 4 }}"
   {{- end }}
   labels:
     app: {{ template "concourse.postgresql.fullname" . }}
diff --git a/templates/postgres-statefulset.yaml b/templates/postgres-statefulset.yaml
index 9836f70..80cbbb6 100644
--- a/templates/postgres-statefulset.yaml
+++ b/templates/postgres-statefulset.yaml
@@ -138,7 +138,7 @@ spec:
       {{- if .Values.postgresql.persistence.selector }}
         selector: {{- .Values.postgresql.persistence.selector | toYaml | nindent 10 }}
       {{- end }}
-        accessModes: {{ (default (list "ReadWriteOnce") .Values.postgresql.persistence.accessMode) | toJson }}
+        accessModes: {{ (default (list "ReadWriteOnce") .Values.postgresql.persistence.accessModes) | toJson }}
       {{- if .Values.postgresql.persistence.resources }}
         resources: {{ .Values.postgresql.persistence.resources | toYaml | nindent 10 }}
       {{- end }}