diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
index 4d956fd..3a08546 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
@@ -49,7 +49,7 @@ end
 
 directory gitlab_rails_public_uploads_dir do
   owner node['gitlab']['user']['username']
-  group node['gitlab']['web-server']['username']
+  group node['gitlab']['web-server']['group']
   mode '0750'
   recursive true
 end
diff --git a/files/gitlab-cookbooks/gitlab/recipes/unicorn.rb b/files/gitlab-cookbooks/gitlab/recipes/unicorn.rb
index 820aaa7..9e9e3b2 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/unicorn.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/unicorn.rb
@@ -38,7 +38,7 @@ end
 
 directory unicorn_socket_dir do
   owner node['gitlab']['user']['username']
-  group node['gitlab']['web-server']['username']
+  group node['gitlab']['web-server']['group']
   mode '0750'
   recursive true
 end
--
libgit2 0.21.2