diff --git a/infra/dev/psql/scripts/configure-psql.sh b/infra/dev/psql/scripts/configure-psql.sh
index 8364628..c9e8739 100644
--- a/infra/dev/psql/scripts/configure-psql.sh
+++ b/infra/dev/psql/scripts/configure-psql.sh
@@ -3,10 +3,11 @@
 temp_pw_file=$(mktemp)
 master_password=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c16)
 echo ${master_password} > ${temp_pw_file}
+sudo chown postgres:postgres "${temp_pw_file}"
 
-export PGSETUP_INITDB_OPTIONS="-U ${master_username} --pwfile ${temp_pw_file}"
-sudo postgresql-setup initdb
-rm -f ${temp_pw_file}
+export PGSETUP_INITDB_OPTIONS="-A password -U ${master_username} --pwfile ${temp_pw_file}"
+sudo -E postgresql-setup initdb
+sudo rm -f ${temp_pw_file}
 
 ctx instance runtime-properties master_username ${master_username}
 ctx instance runtime-properties master_password ${master_password}