diff --git a/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb b/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
index 11e955f..cfbb2fd 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
@@ -15,30 +15,30 @@
 # limitations under the License.
 #
 
-postgresql_dir = node['chef_server']['postgresql']['dir']
-postgresql_data_dir = node['chef_server']['postgresql']['data_dir']
+postgresql_dir = node['gitlab']['postgresql']['dir']
+postgresql_data_dir = node['gitlab']['postgresql']['data_dir']
 postgresql_data_dir_symlink = File.join(postgresql_dir, "data")
-postgresql_log_dir = node['chef_server']['postgresql']['log_directory']
-chef_db_dir = Dir.glob("/opt/chef-server/embedded/service/erchef/lib/chef_db-*").first
+postgresql_log_dir = node['gitlab']['postgresql']['log_directory']
+chef_db_dir = Dir.glob("/opt/gitlab/embedded/service/erchef/lib/chef_db-*").first
 
-user node['chef_server']['postgresql']['username'] do
+user node['gitlab']['postgresql']['username'] do
   system true
-  shell node['chef_server']['postgresql']['shell']
-  home node['chef_server']['postgresql']['home']
+  shell node['gitlab']['postgresql']['shell']
+  home node['gitlab']['postgresql']['home']
 end
 
 directory postgresql_log_dir do
-  owner node['chef_server']['postgresql']['username']
+  owner node['gitlab']['postgresql']['username']
   recursive true
 end
 
 directory postgresql_dir do
-  owner node['chef_server']['postgresql']['username']
+  owner node['gitlab']['postgresql']['username']
   mode "0700"
 end
 
 directory postgresql_data_dir do
-  owner node['chef_server']['postgresql']['username']
+  owner node['gitlab']['postgresql']['username']
   mode "0700"
   recursive true
 end
@@ -48,11 +48,11 @@ link postgresql_data_dir_symlink do
   not_if { postgresql_data_dir == postgresql_data_dir_symlink }
 end
 
-file File.join(node['chef_server']['postgresql']['home'], ".profile") do
-  owner node['chef_server']['postgresql']['username']
+file File.join(node['gitlab']['postgresql']['home'], ".profile") do
+  owner node['gitlab']['postgresql']['username']
   mode "0644"
   content <<-EOH
-PATH=#{node['chef_server']['postgresql']['user_path']}
+PATH=#{node['gitlab']['postgresql']['user_path']}
 EOH
 end
 
@@ -66,7 +66,7 @@ if File.directory?("/etc/sysctl.d") && File.exists?("/etc/init.d/procps")
     source "90-postgresql.conf.sysctl.erb"
     owner "root"
     mode  "0644"
-    variables(node['chef_server']['postgresql'].to_hash)
+    variables(node['gitlab']['postgresql'].to_hash)
     notifies :start, 'service[procps]', :immediately
   end
 else
@@ -79,16 +79,16 @@ else
   bash "add shm settings" do
     user "root"
     code <<-EOF
-      echo 'kernel.shmmax = #{node['chef_server']['postgresql']['shmmax']}' >> /etc/sysctl.conf
-      echo 'kernel.shmall = #{node['chef_server']['postgresql']['shmall']}' >> /etc/sysctl.conf
+      echo 'kernel.shmmax = #{node['gitlab']['postgresql']['shmmax']}' >> /etc/sysctl.conf
+      echo 'kernel.shmall = #{node['gitlab']['postgresql']['shmall']}' >> /etc/sysctl.conf
     EOF
     notifies :run, 'execute[sysctl]', :immediately
     not_if "egrep '^kernel.shmmax = ' /etc/sysctl.conf"
   end
 end
 
-execute "/opt/chef-server/embedded/bin/initdb -D #{postgresql_data_dir}" do
-  user node['chef_server']['postgresql']['username']
+execute "/opt/gitlab/embedded/bin/initdb -D #{postgresql_data_dir}" do
+  user node['gitlab']['postgresql']['username']
   not_if { File.exists?(File.join(postgresql_data_dir, "PG_VERSION")) }
 end
 
@@ -96,9 +96,9 @@ postgresql_config = File.join(postgresql_data_dir, "postgresql.conf")
 
 template postgresql_config do
   source "postgresql.conf.erb"
-  owner node['chef_server']['postgresql']['username']
+  owner node['gitlab']['postgresql']['username']
   mode "0644"
-  variables(node['chef_server']['postgresql'].to_hash)
+  variables(node['gitlab']['postgresql'].to_hash)
   notifies :restart, 'service[postgresql]' if OmnibusHelper.should_notify?("postgresql")
 end
 
@@ -106,26 +106,26 @@ pg_hba_config = File.join(postgresql_data_dir, "pg_hba.conf")
 
 template pg_hba_config do
   source "pg_hba.conf.erb"
-  owner node['chef_server']['postgresql']['username']
+  owner node['gitlab']['postgresql']['username']
   mode "0644"
-  variables(node['chef_server']['postgresql'].to_hash)
+  variables(node['gitlab']['postgresql'].to_hash)
   notifies :restart, 'service[postgresql]' if OmnibusHelper.should_notify?("postgresql")
 end
 
 should_notify = OmnibusHelper.should_notify?("postgresql")
 
 runit_service "postgresql" do
-  down node['chef_server']['postgresql']['ha']
+  down node['gitlab']['postgresql']['ha']
   control(['t'])
   options({
     :log_directory => postgresql_log_dir,
-    :svlogd_size => node['chef_server']['postgresql']['svlogd_size'],
-    :svlogd_num  => node['chef_server']['postgresql']['svlogd_num']
+    :svlogd_size => node['gitlab']['postgresql']['svlogd_size'],
+    :svlogd_num  => node['gitlab']['postgresql']['svlogd_num']
   }.merge(params))
 end
 
-if node['chef_server']['bootstrap']['enable']
-  execute "/opt/chef-server/bin/chef-server-ctl start postgresql" do
+if node['gitlab']['bootstrap']['enable']
+  execute "/opt/gitlab/bin/gitlab-ctl start postgresql" do
     retries 20
   end
 end
@@ -135,9 +135,9 @@ end
 # privileges.
 ###
 pg_helper = PgHelper.new(node)
-pg_port = node['chef_server']['postgresql']['port']
-pg_user = node['chef_server']['postgresql']['username']
-bin_dir = "/opt/chef-server/embedded/bin"
+pg_port = node['gitlab']['postgresql']['port']
+pg_user = node['gitlab']['postgresql']['username']
+bin_dir = "/opt/gitlab/embedded/bin"
 db_name = "opscode_chef"
 
 execute "create #{db_name} database" do
@@ -155,8 +155,8 @@ execute "migrate_database" do
   action :nothing
 end
 
-sql_user        = node['chef_server']['postgresql']['sql_user']
-sql_user_passwd = node['chef_server']['postgresql']['sql_password']
+sql_user        = node['gitlab']['postgresql']['sql_user']
+sql_user_passwd = node['gitlab']['postgresql']['sql_password']
 
 execute "#{bin_dir}/psql --port #{pg_port} -d '#{db_name}' -c \"CREATE USER #{sql_user} WITH SUPERUSER ENCRYPTED PASSWORD '#{sql_user_passwd}'\"" do
   cwd chef_db_dir
@@ -171,8 +171,8 @@ execute "grant #{db_name} privileges" do
   action :nothing
 end
 
-sql_ro_user = node['chef_server']['postgresql']['sql_ro_user']
-sql_ro_user_passwd = node['chef_server']['postgresql']['sql_ro_password']
+sql_ro_user = node['gitlab']['postgresql']['sql_ro_user']
+sql_ro_user_passwd = node['gitlab']['postgresql']['sql_ro_password']
 
 execute "#{bin_dir}/psql --port #{pg_port} -d '#{db_name}' -c \"CREATE USER #{sql_ro_user} WITH SUPERUSER ENCRYPTED PASSWORD '#{sql_ro_user_passwd}'\"" do
   cwd chef_db_dir
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/90-postgresql.conf.sysctl.erb b/files/gitlab-cookbooks/gitlab/templates/default/90-postgresql.conf.sysctl.erb
index 55ae354..bc3e6b1 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/90-postgresql.conf.sysctl.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/90-postgresql.conf.sysctl.erb
@@ -1,5 +1,5 @@
 #
-# chef server postgresql kernel shm tweaks
+# gitlab postgresql kernel shm tweaks
 #
-kernel.shmmax = <%= node['chef_server']['postgresql']['shmmax'] %>
-kernel.shmall = <%= node['chef_server']['postgresql']['shmall'] %>
+kernel.shmmax = <%= node['gitlab']['postgresql']['shmmax'] %>
+kernel.shmall = <%= node['gitlab']['postgresql']['shmall'] %>
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/pg_hba.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/pg_hba.conf.erb
index d7f5651..1b6852d 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/pg_hba.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/pg_hba.conf.erb
@@ -65,11 +65,11 @@
 # "local" is for Unix domain socket connections only
 local   all         all                               trust
 
-<% node['chef_server']['postgresql']['trust_auth_cidr_addresses'].each do |cidr| %>
+<% node['gitlab']['postgresql']['trust_auth_cidr_addresses'].each do |cidr| %>
 host    all         all         <%= cidr %>           trust
 <% end %>
 
-<% node['chef_server']['postgresql']['md5_auth_cidr_addresses'].each do |cidr| %>
+<% node['gitlab']['postgresql']['md5_auth_cidr_addresses'].each do |cidr| %>
 host    all         all         <%= cidr %>           md5
 <% end %>
 
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/postgresql-init.erb b/files/gitlab-cookbooks/gitlab/templates/default/postgresql-init.erb
index 49b5357..07ff9f4 100755
--- a/files/gitlab-cookbooks/gitlab/templates/default/postgresql-init.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/postgresql-init.erb
@@ -9,19 +9,19 @@ RETVAL=0
 
 case "$1" in
   stop|force-stop)
-    /opt/chef-server/embedded/bin/sv once postgresql
-    /opt/chef-server/embedded/bin/sv interrupt postgresql
+    /opt/gitlab/embedded/bin/sv once postgresql
+    /opt/gitlab/embedded/bin/sv interrupt postgresql
     RETVAL=$?
     ;;
   restart)
-    /opt/chef-server/embedded/bin/sv once postgresql
-    /opt/chef-server/embedded/bin/sv interrupt postgresql
+    /opt/gitlab/embedded/bin/sv once postgresql
+    /opt/gitlab/embedded/bin/sv interrupt postgresql
     sleep 5
-    /opt/chef-server/embedded/bin/sv start postgresql
+    /opt/gitlab/embedded/bin/sv start postgresql
     RETVAL=$?
     ;;
 	*)
-		/opt/chef-server/embedded/bin/sv $1 postgresql
+		/opt/gitlab/embedded/bin/sv $1 postgresql
     RETVAL=$?
 esac
 
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb
index 8c2073f..e14bb14 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb
@@ -56,12 +56,12 @@
 
 # - Connection Settings -
 
-listen_addresses = '<%= node['chef_server']['postgresql']['listen_address'] %>'    # what IP address(es) to listen on;
+listen_addresses = '<%= node['gitlab']['postgresql']['listen_address'] %>'    # what IP address(es) to listen on;
           # comma-separated list of addresses;
           # defaults to 'localhost', '*' = all
           # (change requires restart)
-port = <%= node['chef_server']['postgresql']['port'] %>        # (change requires restart)
-max_connections = <%= node['chef_server']['postgresql']['max_connections'] %>      # (change requires restart)
+port = <%= node['gitlab']['postgresql']['port'] %>        # (change requires restart)
+max_connections = <%= node['gitlab']['postgresql']['max_connections'] %>      # (change requires restart)
 # Note:  Increasing max_connections costs ~400 bytes of shared memory per
 # connection slot, plus lock space (see max_locks_per_transaction).
 #superuser_reserved_connections = 3 # (change requires restart)
@@ -106,7 +106,7 @@ max_connections = <%= node['chef_server']['postgresql']['max_connections'] %>   
 
 # - Memory -
 
-shared_buffers = <%= node['chef_server']['postgresql']['shared_buffers'] %> # min 128kB
+shared_buffers = <%= node['gitlab']['postgresql']['shared_buffers'] %> # min 128kB
           # (change requires restart)
 #temp_buffers = 8MB     # min 800kB
 #max_prepared_transactions = 0    # zero disables the feature
@@ -115,7 +115,7 @@ shared_buffers = <%= node['chef_server']['postgresql']['shared_buffers'] %> # mi
 # per transaction slot, plus lock space (see max_locks_per_transaction).
 # It is not advisable to set max_prepared_transactions nonzero unless you
 # actively intend to use prepared transactions.
-work_mem = <%= node['chef_server']['postgresql']['work_mem'] %>				# min 64kB
+work_mem = <%= node['gitlab']['postgresql']['work_mem'] %>				# min 64kB
 #maintenance_work_mem = 16MB    # min 1MB
 #max_stack_depth = 2MB      # min 100kB
 
@@ -171,10 +171,10 @@ work_mem = <%= node['chef_server']['postgresql']['work_mem'] %>				# min 64kB
 
 # - Checkpoints -
 
-checkpoint_segments =  <%= node['chef_server']['postgresql']['checkpoint_segments'] %>		# in logfile segments, min 1, 16MB each, default 3
-checkpoint_timeout = <%= node['chef_server']['postgresql']['checkpoint_timeout'] %>		# range 30s-1h, default 5min
-checkpoint_completion_target = <%= node['chef_server']['postgresql']['checkpoint_completion_target'] %>	# checkpoint target duration, 0.0 - 1.0, default 0.5
-checkpoint_warning = <%= node['chef_server']['postgresql']['checkpoint_warning'] %>		# 0 disables, default 30s
+checkpoint_segments =  <%= node['gitlab']['postgresql']['checkpoint_segments'] %>		# in logfile segments, min 1, 16MB each, default 3
+checkpoint_timeout = <%= node['gitlab']['postgresql']['checkpoint_timeout'] %>		# range 30s-1h, default 5min
+checkpoint_completion_target = <%= node['gitlab']['postgresql']['checkpoint_completion_target'] %>	# checkpoint target duration, 0.0 - 1.0, default 0.5
+checkpoint_warning = <%= node['gitlab']['postgresql']['checkpoint_warning'] %>		# 0 disables, default 30s
 
 # - Archiving -
 
@@ -245,7 +245,7 @@ checkpoint_warning = <%= node['chef_server']['postgresql']['checkpoint_warning']
 #cpu_tuple_cost = 0.01      # same scale as above
 #cpu_index_tuple_cost = 0.005   # same scale as above
 #cpu_operator_cost = 0.0025   # same scale as above
-effective_cache_size = <%= node['chef_server']['postgresql']['effective_cache_size'] %> # Default 128MB
+effective_cache_size = <%= node['gitlab']['postgresql']['effective_cache_size'] %> # Default 128MB
 
 # - Genetic Query Optimizer -
 
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/sv-postgresql-control-t.erb b/files/gitlab-cookbooks/gitlab/templates/default/sv-postgresql-control-t.erb
index ac7eb29..342a197 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/sv-postgresql-control-t.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/sv-postgresql-control-t.erb
@@ -1,3 +1,3 @@
 #!/bin/sh
 echo "received TERM from runit, sending INT instead to force quit connections"
-/opt/chef-server/embedded/bin/sv interrupt postgresql
+/opt/gitlab/embedded/bin/sv interrupt postgresql
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/sv-postgresql-run.erb b/files/gitlab-cookbooks/gitlab/templates/default/sv-postgresql-run.erb
index 67a5a78..34dd33b 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/sv-postgresql-run.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/sv-postgresql-run.erb
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
-exec chpst -P -U <%= node['chef_server']['postgresql']['username'] %> -u <%= node['chef_server']['postgresql']['username'] %> /opt/chef-server/embedded/bin/postgres -D <%= File.join(node['chef_server']['postgresql']['dir'], "data") %>
+exec chpst -P -U <%= node['gitlab']['postgresql']['username'] %> -u <%= node['gitlab']['postgresql']['username'] %> /opt/gitlab/embedded/bin/postgres -D <%= File.join(node['gitlab']['postgresql']['dir'], "data") %>
 
--
libgit2 0.21.2