diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a9a4d44dbe..af4ff2514a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -729,3 +729,8 @@ Style/ZeroLengthPredicate:
 # URISchemes: http, https
 Layout/LineLength:
   Max: 582
+
+Performance/DoubleStartEndWith:
+  Exclude:
+    - 'lib/puppet/ssl/certificate_request.rb'
+
diff --git a/Gemfile b/Gemfile
index 25f19637d1..5111fe0951 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,7 +87,7 @@ end
 
 group :release, optional: true do
   gem 'faraday-retry', require: false
-  gem 'github_changelog_generator', require: false
+  gem 'github_changelog_generator', require: false, git: 'https://github.com/voxpupuli/github-changelog-generator', branch: 'avoid-processing-a-single-commit-multiple-time'
 end
 
 if File.exist? "#{__FILE__}.local"