diff --git a/CHANGELOG b/CHANGELOG
index e0efec2..02da40c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@
 - Enable the 'sign_in_text' field in gitlab.yml (Mike Nestor)
 - Use more fancy SSL ciphers for Nginx
 - Use sane LDAP defaults
+- Clear the Rails cache after modifying gitlab.yml
 
 6.8.1
 - Use gitlab-rails 6.8.1
diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
index 0f952e4..ffb112a 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
@@ -83,6 +83,7 @@ template_symlink File.join(gitlab_rails_etc_dir, "gitlab.yml") do
   mode "0644"
   variables(node['gitlab']['gitlab-rails'].to_hash)
   restarts dependent_services
+  notifies :run, "execute[clear the gitlab-rails cache]"
 end
 
 template_symlink File.join(gitlab_rails_etc_dir, "rack_attack.rb") do
@@ -114,3 +115,8 @@ end
 end
 
 execute "chown -R #{node['gitlab']['user']['username']} /opt/gitlab/embedded/service/gitlab-rails/public"
+
+execute "clear the gitlab-rails cache" do
+  command "/opt/gitlab/bin/gitlab-rake cache:clear"
+  action :nothing
+end
--
libgit2 0.21.2