diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index dfd0306..a2751fc 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -136,6 +136,16 @@ default['gitlab']['gitlab-rails']['smtp_domain'] = nil
 default['gitlab']['gitlab-rails']['smtp_authentication'] = nil
 default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil
 
+
+####
+# Remote user settings
+####
+default['gitlab']['gitlab-rails']['env_enable'] = false
+default['gitlab']['gitlab-rails']['env_database_name'] = nil
+default['gitlab']['gitlab-rails']['env_database_host'] = nil
+default['gitlab']['gitlab-rails']['env_database_user'] = nil
+default['gitlab']['gitlab-rails']['env_database_password'] = nil
+
 ####
 # Unicorn
 ####
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
index d949b72..6c9611b 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -160,7 +160,14 @@ production: &base
     #   Ex. ou=Groups,dc=gitlab,dc=example
     #
     group_base: <%= single_quote(@ldap_group_base) %>
-
+  <% if @env_enable %>
+  env:
+    enabled: <%= @env_enable %>
+    database_name: <%= single_quote(@env_database_name) %>
+    host: <%= single_quote(@env_database_host) %>
+    user: <%= single_quote(@env_database_user) %>
+    password: <%= single_quote(@env_database_password) %>
+  <% end %>
 
   ## OmniAuth settings
   omniauth:
--
libgit2 0.21.2