diff --git a/CHANGELOG.md b/CHANGELOG.md
index 183c837..a72639a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+
 ## [v0.2.0](https://github.com/puppetlabs/puppet-modulebuilder/tree/v0.2.0) (2020-04-30)
 
 [Full Changelog](https://github.com/puppetlabs/puppet-modulebuilder/compare/v0.1.0...v0.2.0)
diff --git a/Gemfile b/Gemfile
index 3350f19..08c608a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,9 +13,9 @@ group :development do
     gem 'rubocop-rspec', '~> 1.38'
 
     gem 'codecov', '~> 0.1'
+    gem 'github_changelog_generator', '~> 1.15', require: false
     gem 'simplecov', '~> 0.18'
     gem 'simplecov-console', '~> 0.6'
-    gem 'github_changelog_generator', '~> 1.15', require: false
   end
 
   if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
diff --git a/Rakefile b/Rakefile
index 3356171..9477c4a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -25,19 +25,23 @@ end
 
 task default: [:spec, :acceptance]
 
-
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   require 'github_changelog_generator/task'
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
-    config.user = "puppetlabs"
-    config.project = "puppet-modulebuilder"
+    config.user = 'puppetlabs'
+    config.project = 'puppet-modulebuilder'
     require 'puppet/modulebuilder/version'
     config.future_release = "v#{Puppet::Modulebuilder::VERSION}"
     config.exclude_labels = ['maintenance']
-    config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
+    config.header = <<-HEADER
+                      # Change log
+
+                      All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
+    HEADER
+                    .gsub(%r{^ *}, '')
+
     config.add_pr_wo_labels = true
     config.issues = false
-    config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM"
+    config.merge_prefix = '### UNCATEGORIZED PRS; GO LABEL THEM'
   end
 end