diff --git a/chart/templates/marquez/deployment.yaml b/chart/templates/marquez/deployment.yaml
index 3c9aa45a54..2a03342f92 100644
--- a/chart/templates/marquez/deployment.yaml
+++ b/chart/templates/marquez/deployment.yaml
@@ -34,12 +34,14 @@ spec:
             - /bin/bash
           args:
             - -ec
-            - until pg_isready -h ${POSTGRES_HOST} -p ${POSTGRES_PORT}; do echo waiting for database; sleep 2; done;
+            - until pg_isready -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USER}; do echo waiting for database; sleep 2; done;
           env:
             - name: POSTGRES_HOST
               value: {{ include "marquez.database.host" . | quote }}
             - name: POSTGRES_PORT
               value: {{ include "marquez.database.port" . | quote }}
+            - name: POSTGRES_USER
+              value: {{ include "marquez.database.user" . | quote }}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 0e0985100c..0cbc2e4208 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -107,7 +107,7 @@ postgresql:
   ## @param image.tag PostgreSQL image tag (immutable tags are recommended)
   ##
   image:
-    tag: 0.29.0
+    tag: 12.1.0
   ## Authentication parameters
   ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
   ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run