diff --git a/files/gitlab-cookbooks/gitlab/templates/default/90-postgresql.conf.sysctl.erb b/files/gitlab-cookbooks/gitlab/templates/default/90-postgresql.conf.sysctl.erb
index bc3e6b1..7728f32 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/90-postgresql.conf.sysctl.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/90-postgresql.conf.sysctl.erb
@@ -1,3 +1,6 @@
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
 #
 # gitlab postgresql kernel shm tweaks
 #
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb
index 7d0c296..8e2f3a9 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb
@@ -1,3 +1,7 @@
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
+
 production:
   adapter: <%= @db_adapter %>
   encoding: <%= @db_encoding %>
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitconfig.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitconfig.erb
index 8a60edb..308d112 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitconfig.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitconfig.erb
@@ -1,3 +1,7 @@
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
+
 [user]
         name = <%= node['gitlab']['user']['git_user_name'] %>
         email = <%= node['gitlab']['user']['git_user_email'] %>
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 405ac8d..7a69b47 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
@@ -1,3 +1,7 @@
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
+
 # GitLab user. git by default
 user: <%= @user %>
 
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
index 53e8cc4..1dd73c7 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -1,11 +1,6 @@
-# # # # # # # # # # # # # # # # # #
-# GitLab application config file  #
-# # # # # # # # # # # # # # # # # #
-#
-# How to use:
-# 1. copy file as gitlab.yml
-# 2. Replace gitlab -> host with your domain
-# 3. Replace gitlab -> email_from
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
 
 production: &base
   #
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
index d7c0aef..7b8fe04 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
@@ -1,3 +1,7 @@
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
+
 # GITLAB
 # Maintainer: @randx
 
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
index 403d911..17f181b 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
@@ -1,3 +1,7 @@
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
+
 user <%= node['gitlab']['user']['username'] %> <%= node['gitlab']['user']['username']%>;
 worker_processes <%= @worker_processes %>;
 error_log /var/log/gitlab/nginx/error.log;
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/pg_hba.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/pg_hba.conf.erb
index 1b6852d..be48fa3 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/pg_hba.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/pg_hba.conf.erb
@@ -1,3 +1,7 @@
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
+
 # PostgreSQL Client Authentication Configuration File
 # ===================================================
 #
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb
index e14bb14..e49c71e 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb
@@ -1,3 +1,7 @@
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
+
 # -----------------------------
 # PostgreSQL configuration file
 # -----------------------------
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/rack_attack.rb.erb b/files/gitlab-cookbooks/gitlab/templates/default/rack_attack.rb.erb
index 8b83945..ade64d8 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/rack_attack.rb.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/rack_attack.rb.erb
@@ -1,3 +1,7 @@
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
+
 # 1. Rename this file to rack_attack.rb
 # 2. Review the paths_to_be_protected and add any other path you need protecting
 #
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb
index b92029f..86530ce 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb
@@ -1,3 +1,7 @@
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
+
 # Redis configuration file example
 
 # Note on units: when memory size is needed, it is possible to specify
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/unicorn.rb.erb b/files/gitlab-cookbooks/gitlab/templates/default/unicorn.rb.erb
index 7ed20db..4c5806f 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/unicorn.rb.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/unicorn.rb.erb
@@ -1,7 +1,7 @@
-##
-# Unicorn config at <%= @name %>
-# Managed by Chef - Local Changes will be Nuked from Orbit (just to be sure)
-##
+# This file is managed by gitlab-ctl. Manual changes will be
+# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
+# and run `sudo gitlab-ctl reconfigure`.
+
 
 # What ports/sockets to listen on, and what options for them.
 <%- @listen.each do |port, options| %>
--
libgit2 0.21.2