diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
index 8658de4..33d57cf 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
@@ -29,7 +29,7 @@ template File.join(gitlab_shell_dir, "config.yml") do
     :user => git_user,
     :api_url => node['gitlab']['gitlab-core']['internal_api_url'],
     :repositories_path => repositories_path,
-    :ssh_dir => ssh_dir,
+    :authorized_keys => File.join(ssh_dir, "authorized_keys"),
     :redis_port => node['gitlab']['redis']['port'],
     :log_file => File.join(log_directory, "gitlab-shell.log")
   )
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab-shell-config.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab-shell-config.yml.erb
index 4be7461..405ac8d 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab-shell-config.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab-shell-config.yml.erb
@@ -18,7 +18,7 @@ http_settings:
 repos_path: "<%= @repositories_path %>"
 
 # File used as authorized_keys for gitlab user
-auth_file: "<%= @ssh_dir %>/authorized_keys"
+auth_file: "<%= @authorized_keys %>"
 
 # Redis settings used for pushing commit notices to gitlab
 redis:
--
libgit2 0.21.2