diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index d4c443e..0a1063b 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -43,24 +43,18 @@ default['gitlab']['gitlab-rails']['dir'] = "/var/opt/gitlab/gitlab-rails"
 default['gitlab']['gitlab-rails']['log_directory'] = "/var/log/gitlab/gitlab-rails"
 default['gitlab']['gitlab-rails']['environment'] = 'production'
 
-default['gitlab']['gitlab-rails']['repositories_path'] = "/var/opt/gitlab/repositories"
-default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/gitlab-satellites"
 default['gitlab']['gitlab-rails']['internal_api_url'] = "http://localhost:8080"
-default['gitlab']['gitlab-rails']['external_fqdn'] = node['fqdn']
-default['gitlab']['gitlab-rails']['external_port'] = 80
-default['gitlab']['gitlab-rails']['external_https'] = false
-default['gitlab']['gitlab-rails']['notification_email'] = "gitlab@#{node['fqdn']}"
-default['gitlab']['gitlab-rails']['support_email'] = "support@example.com"
 default['gitlab']['gitlab-rails']['uploads_directory'] = "/var/opt/gitlab/uploads"
 default['gitlab']['gitlab-rails']['rate_limit_requests_per_period'] = 10
 default['gitlab']['gitlab-rails']['rate_limit_period'] = 60
 
-default['gitlab']['gitlab-rails']['gitlab_host'] = "localhost"
+default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn']
 default['gitlab']['gitlab-rails']['gitlab_port'] = 80
 default['gitlab']['gitlab-rails']['gitlab_https'] = false
 default['gitlab']['gitlab-rails']['gitlab_user'] = "git"
-default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@localhost"
+default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}"
 default['gitlab']['gitlab-rails']['gitlab_support_email'] = "support@localhost"
+default['gitlab']['gitlab-rails']['support_email'] = "support@example.com"
 default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10
 default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = true
 default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = true
@@ -96,7 +90,7 @@ default['gitlab']['gitlab-rails']['omniauth_enabled'] = false
 default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = false
 default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = true
 default['gitlab']['gitlab-rails']['omniauth_providers'] =
-default['gitlab']['gitlab-rails']['satellites_path'] = "/home/git/gitlab-satellites/"
+default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/gitlab-satellites"
 default['gitlab']['gitlab-rails']['backup_path'] = "tmp/backups"
 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/home/git/gitlab-shell/"
 default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/home/git/repositories/"
diff --git a/files/gitlab-cookbooks/gitlab/libraries/gitlab.rb b/files/gitlab-cookbooks/gitlab/libraries/gitlab.rb
index b08c8fb..5a6cbda 100644
--- a/files/gitlab-cookbooks/gitlab/libraries/gitlab.rb
+++ b/files/gitlab-cookbooks/gitlab/libraries/gitlab.rb
@@ -84,14 +84,14 @@ module Gitlab
         raise "External URL must include a FQDN"
       end
       Gitlab['user']['git_user_email'] ||= "gitlab@#{uri.host}"
-      Gitlab['gitlab_rails']['external_fqdn'] = uri.host
-      Gitlab['gitlab_rails']['notification_email'] ||= "gitlab@#{uri.host}"
+      Gitlab['gitlab_rails']['gitlab_host'] = uri.host
+      Gitlab['gitlab_rails']['gitlab_email_from'] ||= "gitlab@#{uri.host}"
 
       case uri.scheme
       when "http"
-        Gitlab['gitlab_rails']['external_https'] = false
+        Gitlab['gitlab_rails']['gitlab_https'] = false
       when "https"
-        Gitlab['gitlab_rails']['external_https'] = true
+        Gitlab['gitlab_rails']['gitlab_https'] = true
       else
         raise "Unsupported external URL scheme: #{uri.scheme}"
       end
@@ -100,7 +100,7 @@ module Gitlab
         raise "Unsupported external URL path: #{uri.path}"
       end
 
-      Gitlab['gitlab_rails']['external_port'] = uri.port
+      Gitlab['gitlab_rails']['gitlab_port'] = uri.port
     end
 
     def generate_hash
diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
index a156cc9..37d61bd 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
@@ -20,7 +20,7 @@ git_user = node['gitlab']['user']['username']
 git_group = node['gitlab']['user']['group']
 gitlab_shell_dir = "/opt/gitlab/embedded/service/gitlab-shell"
 gitlab_shell_var_dir = "/var/opt/gitlab/gitlab-shell"
-repositories_path = node['gitlab']['gitlab-rails']['repositories_path']
+repositories_path = node['gitlab']['gitlab-rails']['gitlab_shell_repos_path']
 ssh_dir = File.join(node['gitlab']['user']['home'], ".ssh")
 log_directory = node['gitlab']['gitlab-shell']['log_directory']
 
diff --git a/files/gitlab-cookbooks/gitlab/recipes/nginx.rb b/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
index fc3d706..6c29781 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/nginx.rb
@@ -44,7 +44,7 @@ template nginx_vars[:gitlab_http_config] do
   mode "0644"
   variables(nginx_vars.merge(
     {
-      :fqdn => node['gitlab']['gitlab-rails']['external_fqdn'],
+      :fqdn => node['gitlab']['gitlab-rails']['gitlab_host'],
       :socket => node['gitlab']['unicorn']['socket']
     }
   ))
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
index f88fd5a..49d7188 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -15,9 +15,9 @@ production: &base
   ## GitLab settings
   gitlab:
     ## Web server settings (note: host is the FQDN, do not include http://)
-    host: <%= node['gitlab']['gitlab-rails']['external_fqdn'] %>
-    port: <%= node['gitlab']['gitlab-rails']['external_port'] %>
-    https: <%= node['gitlab']['gitlab-rails']['external_https'] %>
+    host: <%= node['gitlab']['gitlab-rails']['gitlab_host'] %>
+    port: <%= node['gitlab']['gitlab-rails']['gitlab_port'] %>
+    https: <%= node['gitlab']['gitlab-rails']['gitlab_https'] %>
 
     # Uncomment and customize the last line to run in a non-root path
     # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. 
@@ -35,10 +35,10 @@ production: &base
 
     ## Email settings
     # Email address used in the "From" field in mails sent by GitLab
-    email_from: <%= node['gitlab']['gitlab-rails']['notification_email'] %>
+    email_from: <%= node['gitlab']['gitlab-rails']['gitlab_email_from'] %>
 
     # Email address of your support contact (default: same as email_from)
-    support_email: <%= node['gitlab']['gitlab-rails']['support_email'] %>
+    support_email: <%= node['gitlab']['gitlab-rails']['gitlab_support_email'] %>
 
     ## User settings
     default_projects_limit: 10
@@ -187,7 +187,7 @@ production: &base
     path: /opt/gitlab/embedded/service/gitlab-shell/
 
     # REPOS_PATH MUST NOT BE A SYMLINK!!!
-    repos_path: <%= node['gitlab']['gitlab-rails']['repositories_path'] %>
+    repos_path: <%= node['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] %>
     hooks_path: /opt/gitlab/embedded/service/gitlab-shell/hooks/
 
     # Git over HTTP
--
libgit2 0.21.2