diff --git a/playbook/roles/gitlab/files/gitlab-pre-install.sh b/playbook/roles/gitlab/files/gitlab-pre-install.sh
index b10cd1f9..382f0bb3 100755
--- a/playbook/roles/gitlab/files/gitlab-pre-install.sh
+++ b/playbook/roles/gitlab/files/gitlab-pre-install.sh
@@ -2,4 +2,4 @@
 export namespace=$1
 export POSTGRES_PASSWORD=`kubectl get secret --namespace $namespace postgresql -o jsonpath="{.data.postgres-password}" | base64 -d`
 
-kubectl run postgresql-client --rm --tty -i --restart='Never' --namespace $namespace --image docker.io/bitnami/postgresql:15.2.0-debian-11-r11 --env="PGPASSWORD=$POSTGRES_PASSWORD" --command -- psql --host postgresql -U postgres -d postgres -p 5432 -w -c "CREATE EXTENSION IF NOT EXISTS pg_trgm; CREATE EXTENSION IF NOT EXISTS btree_gist; CREATE DATABASE gitlabhq_production OWNER gitlab;" || echo true
+kubectl run postgresql-client --rm --tty -i --restart='Never' --namespace $namespace --image docker.io/bitnami/postgresql:15.2.0-debian-11-r11 --env="PGPASSWORD=$POSTGRES_PASSWORD" --command -- psql --host postgresql -U postgres -d postgres -p 5432 -w -c "CREATE EXTENSION IF NOT EXISTS pg_trgm; CREATE EXTENSION IF NOT EXISTS btree_gist; CREATE DATABASE gitlabhq_production OWNER postgres;" || echo true
diff --git a/playbook/roles/gitlab/files/setup.sh b/playbook/roles/gitlab/files/setup.sh
index 811dc1e7..41450b36 100644
--- a/playbook/roles/gitlab/files/setup.sh
+++ b/playbook/roles/gitlab/files/setup.sh
@@ -46,7 +46,7 @@ global:
   psql:
     host: postgresql.database.svc.cluster.local
     port: 5432
-    username: gitlab
+    username: postgres
     database: gitlabhq_production
     password:
       secret: $gitlab_db_secret