diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
index 5982e50..f4f6c04 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
@@ -30,7 +30,6 @@ gitlab_rails_log_dir = node['gitlab']['gitlab-rails']['log_directory']
   gitlab_rails_env_dir,
   gitlab_rails_working_dir,
   gitlab_rails_tmp_dir,
-  gitlab_rails_public_uploads_dir,
   node['gitlab']['gitlab-rails']['backup_path'],
   node['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'],
   gitlab_rails_log_dir
@@ -50,11 +49,18 @@ end
 
 directory File.join(gitlab_rails_dir, "sockets") do
   owner node['gitlab']['user']['username']
-  group node['gitlab']['web_server']['username']
+  group node['gitlab']['webserver']['username']
   mode '0770'
   recursive true
 end
 
+directory gitlab_rails_public_uploads_dir do
+  owner node['gitlab']['user']['username']
+  group node['gitlab']['webserver']['username']
+  mode '0750'
+  recursive true
+end
+
 dependent_services = []
 dependent_services << "service[unicorn]" if OmnibusHelper.should_notify?("unicorn")
 dependent_services << "service[sidekiq]" if OmnibusHelper.should_notify?("sidekiq")
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
index 0ae2723..4672ee0 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
@@ -2,7 +2,7 @@
 # erased! To change the contents below, edit /etc/gitlab/gitlab.rb
 # and run `sudo gitlab-ctl reconfigure`.
 
-user <%= node['gitlab']['user']['username'] %> <%= node['gitlab']['web_server']['username']%>;
+user <%= node['gitlab']['user']['username'] %> <%= node['gitlab']['webserver']['username']%>;
 worker_processes <%= @worker_processes %>;
 error_log /var/log/gitlab/nginx/error.log;
 pid /var/opt/gitlab/nginx/nginx.pid;
--
libgit2 0.21.2