diff --git a/.sync.yml b/.sync.yml
index 4381de0..aee14db 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,7 +1,7 @@
 ---
 ".travis.yml":
   user: camptocamp
-  secure: "oVFK/jAf7ZbNR8cdo2AcqwnKp1pktpa+EkImXGF2b6L7OxOl2VXxbBKGW1IueUccmDH381XqrMtdbCVgz83u3HdpkHb3PIFmchPgPeIBgevdubyfulHdwYN++nLL9zxRH+FXhW1qmqpvHFS8CHw4Ia2k69gdcQNNlC60WYk1QwxLYTnTaem2nWZsmNZBNgh5TFzTJzsbJQFoyJlUUkbkg7rZig3qSw/otqwh/HUrEA+UUcBv6B6cIeMaKzaGvHWvfdXv8asT+r/kl/048J2FZM1ulQxZE+273Z1xwp4KATx00NqpceFcvHAInbMkgYuwi3nDJo4pKpqKWKvlw1CJm9+uXk9qYgFhaQpmkz5Jc3njiPZadRITkYG4T9dUHlvN47LDJOZNCwr8kjEkakI1Rv/H7tFlxHG/42TJDAs9dqB4aoiflzo4GOBAsx+YtpTmM+1aWvdDjeedxnuVrGn1lgHkibm7kSiNZDdxQ4/Xv/yYmuko8kam/HdlXC7bg0myQE4zdHPAxcn6qnC6zifmssgonaGXlx+3Hmnqqb7F3vv5+w4Nb9VYekVc6JY0slyq5ADvbNkSL2dGx0qlX4dD2puRgZM/NFAGsJ0AANIIDGWBDb3nj8ofvpRs7ab48U2eRiLb+3vhnIK83S4CdNnZH7TidCv9Y6bAcuQkD0qlXUQ="
+  secure: "K4iXyf0gsTwNZ9m8a+lxOZROp2DK7BOkU34M7O7cq8RKjOJ1UInO4Ewni3el+2o6zJ1mTZmaBfBAetnimaKnoiADTG5V6MfJIST0M8xzVdlXppqel9//UNyDaynId9AxIg17XjO86xDm3F4X3HaPhgXRraUEpzrgVRXppTVyzrlV5Zn2nUqxJ7LW9HQ4Q3l4vIm00qUfjeTsqW3HJZ6l6947jvpUGdFf7tv+Tcjarjm71TRtPmEtUpPChTOKKQoBdDMCOqzAB4kvpZa8/WRNyQKpNSJIzaOVVoVdCxtW/TRoIR1Jg+mOyTEnTJIjcTwPeuIyFGAJKnKd/Si1vGBmGWkgEtyqQuVjWLBMIxsEP21d5OUPGMhoFabcGDR/C0ppdX7w1DPTqwsn3SES+JbSIdFPh6jcI0QSqXs1k+NCu62Hhj7VzCjBLI55Npay8ukpoY2OBOM8Eg+H3IYENm8Y+8u8vELHUdmB7YQGQUhx3huzbc6xO+M5YQf6fVdG/fgLPea8apoKTbpZfoiIoS+rP9sl0df3c6DTdpn4kMGAzBt/5tngmhR3uwlXgwGwQT+DTnKahLGPWzn+ITecbN8MxYBmkmXy4aQ09m0OAiiagmQlsHX7K+h6hw2Lu5yIPGsFTluRzGsF8T9J9hNCjmPKVZacKRcFRgA8E92J9i4QA+k="
 
 ".gitlab-ci.yml":
   delete: true
diff --git a/.travis.yml b/.travis.yml
index 346f633..16c5430 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ deploy:
   provider: puppetforge
   username: camptocamp
   password:
-    secure: "oVFK/jAf7ZbNR8cdo2AcqwnKp1pktpa+EkImXGF2b6L7OxOl2VXxbBKGW1IueUccmDH381XqrMtdbCVgz83u3HdpkHb3PIFmchPgPeIBgevdubyfulHdwYN++nLL9zxRH+FXhW1qmqpvHFS8CHw4Ia2k69gdcQNNlC60WYk1QwxLYTnTaem2nWZsmNZBNgh5TFzTJzsbJQFoyJlUUkbkg7rZig3qSw/otqwh/HUrEA+UUcBv6B6cIeMaKzaGvHWvfdXv8asT+r/kl/048J2FZM1ulQxZE+273Z1xwp4KATx00NqpceFcvHAInbMkgYuwi3nDJo4pKpqKWKvlw1CJm9+uXk9qYgFhaQpmkz5Jc3njiPZadRITkYG4T9dUHlvN47LDJOZNCwr8kjEkakI1Rv/H7tFlxHG/42TJDAs9dqB4aoiflzo4GOBAsx+YtpTmM+1aWvdDjeedxnuVrGn1lgHkibm7kSiNZDdxQ4/Xv/yYmuko8kam/HdlXC7bg0myQE4zdHPAxcn6qnC6zifmssgonaGXlx+3Hmnqqb7F3vv5+w4Nb9VYekVc6JY0slyq5ADvbNkSL2dGx0qlX4dD2puRgZM/NFAGsJ0AANIIDGWBDb3nj8ofvpRs7ab48U2eRiLb+3vhnIK83S4CdNnZH7TidCv9Y6bAcuQkD0qlXUQ="
+    secure: "K4iXyf0gsTwNZ9m8a+lxOZROp2DK7BOkU34M7O7cq8RKjOJ1UInO4Ewni3el+2o6zJ1mTZmaBfBAetnimaKnoiADTG5V6MfJIST0M8xzVdlXppqel9//UNyDaynId9AxIg17XjO86xDm3F4X3HaPhgXRraUEpzrgVRXppTVyzrlV5Zn2nUqxJ7LW9HQ4Q3l4vIm00qUfjeTsqW3HJZ6l6947jvpUGdFf7tv+Tcjarjm71TRtPmEtUpPChTOKKQoBdDMCOqzAB4kvpZa8/WRNyQKpNSJIzaOVVoVdCxtW/TRoIR1Jg+mOyTEnTJIjcTwPeuIyFGAJKnKd/Si1vGBmGWkgEtyqQuVjWLBMIxsEP21d5OUPGMhoFabcGDR/C0ppdX7w1DPTqwsn3SES+JbSIdFPh6jcI0QSqXs1k+NCu62Hhj7VzCjBLI55Npay8ukpoY2OBOM8Eg+H3IYENm8Y+8u8vELHUdmB7YQGQUhx3huzbc6xO+M5YQf6fVdG/fgLPea8apoKTbpZfoiIoS+rP9sl0df3c6DTdpn4kMGAzBt/5tngmhR3uwlXgwGwQT+DTnKahLGPWzn+ITecbN8MxYBmkmXy4aQ09m0OAiiagmQlsHX7K+h6hw2Lu5yIPGsFTluRzGsF8T9J9hNCjmPKVZacKRcFRgA8E92J9i4QA+k="
   on:
     tags: true
     all_branches: true
diff --git a/Rakefile b/Rakefile
index cb7ed0c..0a5093b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -52,7 +52,7 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     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.add_pr_wo_labels = true
     config.issues = false
-    config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM"
+    config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
     config.configure_sections = {
       "Changed" => {
         "prefix" => "### Changed",
@@ -60,11 +60,11 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
       },
       "Added" => {
         "prefix" => "### Added",
-        "labels" => ["feature", "enhancement"],
+        "labels" => ["enhancement", "feature"],
       },
       "Fixed" => {
         "prefix" => "### Fixed",
-        "labels" => ["bugfix"],
+        "labels" => ["bug", "documentation", "bugfix"],
       },
     }
   end
@@ -72,16 +72,15 @@ else
   desc 'Generate a Changelog from GitHub'
   task :changelog do
     raise <<EOM
-The changelog tasks depends on unreleased features of the github_changelog_generator gem.
+The changelog tasks depends on recent features of the github_changelog_generator gem.
 Please manually add it to your .sync.yml for now, and run `pdk update`:
 ---
 Gemfile:
   optional:
     ':development':
       - gem: 'github_changelog_generator'
-        git: 'https://github.com/skywinder/github-changelog-generator'
-        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
-        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
+        version: '~> 1.15'
+        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')"
 EOM
   end
 end
diff --git a/metadata.json b/metadata.json
index 5fe33d9..7cd05ef 100644
--- a/metadata.json
+++ b/metadata.json
@@ -63,5 +63,5 @@
   ],
   "pdk-version": "1.17.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#master",
-  "template-ref": "heads/master-0-g88b05c7"
+  "template-ref": "heads/master-0-g3d2e75c"
 }