diff --git a/helm/postgres-upgrade/templates/postgres-upgrade-job.yaml b/helm/postgres-upgrade/templates/postgres-upgrade-job.yaml
index 077889a..91770a4 100644
--- a/helm/postgres-upgrade/templates/postgres-upgrade-job.yaml
+++ b/helm/postgres-upgrade/templates/postgres-upgrade-job.yaml
@@ -3,35 +3,35 @@ kind: Job
 metadata:
   name: postgres-upgrade-job
   labels:
-    {{- include "postgres-upgrade.labels" . | nindent 4 }}
+{{- include "postgres-upgrade.labels" . | nindent 4 }}
 spec:
   backoffLimit: 0
   template:
     metadata:
       labels:
-        {{- include "postgres-upgrade.selectorLabels" . | nindent 8 }}
+{{- include "postgres-upgrade.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/name: postgres-upgrade-job
         sidecar.istio.io/inject: "false"
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
+{{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ include "postgres-upgrade.serviceAccountName" . }}
       securityContext:
-        {{- toYaml .Values.jobSecurityContext | nindent 8 }}
+{{- toYaml .Values.jobSecurityContext | nindent 8 }}
       restartPolicy: Never  # This is one time job
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
+{{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-          - name: SU_USER_PWD
-            value: {{ .Values.database.su.su_password }}
-          - name: DB_USER_PWD
-            value: {{ .Values.database.dbu.dbu_password }}
+            - name: SU_USER_PWD
+              value: "{{ .Values.database.su.su_password }}"
+            - name: DB_USER_PWD
+              value: "{{ .Values.database.dbu.dbu_password }}"
           envFrom:
             - configMapRef:
                 name: postgres-upgrade-env-config