diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index acceba7..4da1f2e 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -27,11 +27,11 @@ default['gitlab']['postgresql']['data_dir'] = "/var/opt/gitlab/postgresql/data"
 default['gitlab']['postgresql']['log_directory'] = "/var/log/gitlab/postgresql"
 default['gitlab']['postgresql']['svlogd_size'] = 1000000
 default['gitlab']['postgresql']['svlogd_num'] = 10
-default['gitlab']['postgresql']['username'] = "opscode-pgsql"
+default['gitlab']['postgresql']['username'] = "gitlab-psql"
 default['gitlab']['postgresql']['shell'] = "/bin/sh"
 default['gitlab']['postgresql']['home'] = "/var/opt/gitlab/postgresql"
 default['gitlab']['postgresql']['user_path'] = "/opt/gitlab/embedded/bin:/opt/gitlab/bin:$PATH"
-default['gitlab']['postgresql']['sql_user'] = "opscode_chef"
+default['gitlab']['postgresql']['sql_user'] = "gitlab"
 default['gitlab']['postgresql']['sql_password'] = "snakepliskin"
 default['gitlab']['postgresql']['sql_ro_user'] = "opscode_chef_ro"
 default['gitlab']['postgresql']['sql_ro_password'] = "shmunzeltazzen"
diff --git a/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb b/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
index 5567986..3e18452 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
@@ -138,7 +138,7 @@ pg_helper = PgHelper.new(node)
 pg_port = node['gitlab']['postgresql']['port']
 pg_user = node['gitlab']['postgresql']['username']
 bin_dir = "/opt/gitlab/embedded/bin"
-db_name = "opscode_chef"
+db_name = "gitlabhq_production"
 
 execute "create #{db_name} database" do
   command "#{bin_dir}/createdb -T template0 --port #{pg_port} -E UTF-8 #{db_name}"
--
libgit2 0.21.2