diff --git a/.msync.yml b/.msync.yml
index c632e46..e1cef55 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '1.9.6'
+modulesync_config_version: '2.0.0'
diff --git a/.overcommit.yml b/.overcommit.yml
index 31699e7..1b03fad 100644
--- a/.overcommit.yml
+++ b/.overcommit.yml
@@ -1,63 +1,64 @@
 # Managed by https://github.com/voxpupuli/modulesync_configs
 #
 # Hooks are only enabled if you take action.
 #
 # To enable the hooks run:
 #
 # ```
 # bundle exec overcommit --install
 # # ensure .overcommit.yml does not harm to you and then
 # bundle exec overcommit --sign
 # ```
 #
 # (it will manage the .git/hooks directory):
 #
 # Examples howto skip a test for a commit or push:
 #
 # ```
 # SKIP=RuboCop git commit
 # SKIP=PuppetLint git commit
 # SKIP=RakeTask git push
 # ```
 #
 # Don't invoke overcommit at all:
 #
 # ```
 # OVERCOMMIT_DISABLE=1 git commit
 # ```
 #
 # Read more about overcommit: https://github.com/brigade/overcommit
 #
 # To manage this config yourself in your module add
 #
 # ```
 # .overcommit.yml:
 #   unmanaged: true
 # ```
 #
 # to your modules .sync.yml config
 ---
 PreCommit:
   RuboCop:
     enabled: true
     description: 'Runs rubocop on modified files only'
     command: ['bundle', 'exec', 'rubocop']
   PuppetLint:
     enabled: true
     description: 'Runs puppet-lint on modified files only'
     command: ['bundle', 'exec', 'puppet-lint']
   YamlSyntax:
     enabled: true
   JsonSyntax:
     enabled: true
   TrailingWhitespace:
     enabled: true
 
 PrePush:
   RakeTarget:
     enabled: true
     description: 'Run rake targets'
     targets:
+      - 'validate'
       - 'test'
       - 'rubocop'
     command: [ 'bundle', 'exec', 'rake' ]
diff --git a/Gemfile b/Gemfile
index 998c9ed..20f3df0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,83 +1,83 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 def location_for(place, fake_version = nil)
   if place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place =~ /^file:\/\/(.*)/
     ['>= 0', { :path => File.expand_path($1), :require => false }]
   else
     [place, { :require => false }]
   end
 end
 
 group :test do
   gem 'puppetlabs_spec_helper', '~> 2.6',                           :require => false
   gem 'rspec-puppet', '~> 2.5',                                     :require => false
   gem 'rspec-puppet-facts',                                         :require => false
   gem 'rspec-puppet-utils',                                         :require => false
   gem 'puppet-lint-leading_zero-check',                             :require => false
   gem 'puppet-lint-trailing_comma-check',                           :require => false
   gem 'puppet-lint-version_comparison-check',                       :require => false
   gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  :require => false
   gem 'puppet-lint-unquoted_string-check',                          :require => false
   gem 'puppet-lint-variable_contains_upcase',                       :require => false
   gem 'metadata-json-lint',                                         :require => false
   gem 'redcarpet',                                                  :require => false
   gem 'rubocop', '~> 0.49.1',                                       :require => false if RUBY_VERSION >= '2.3.0'
   gem 'rubocop-rspec', '~> 1.15.0',                                 :require => false if RUBY_VERSION >= '2.3.0'
   gem 'mocha', '~> 1.4.0',                                          :require => false
   gem 'coveralls',                                                  :require => false
   gem 'simplecov-console',                                          :require => false
   gem 'rack', '~> 1.0',                                             :require => false if RUBY_VERSION < '2.2.2'
   gem 'parallel_tests',                                             :require => false
 end
 
 group :development do
   gem 'travis',                   :require => false
   gem 'travis-lint',              :require => false
   gem 'guard-rake',               :require => false
   gem 'overcommit', '>= 0.39.1',  :require => false
 end
 
 group :system_tests do
   gem 'winrm',                              :require => false
   if beaker_version = ENV['BEAKER_VERSION']
     gem 'beaker', *location_for(beaker_version)
   else
     gem 'beaker', '>= 3.9.0', :require => false
   end
   if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',                         :require => false
   gem 'beaker-hostgenerator', '>= 1.1.10',  :require => false
   gem 'beaker-docker',                      :require => false
   gem 'beaker-puppet',                      :require => false
   gem 'beaker-puppet_install_helper',       :require => false
   gem 'beaker-module_install_helper',       :require => false
   gem 'rbnacl', '>= 4',                     :require => false if RUBY_VERSION >= '2.2.6'
   gem 'rbnacl-libsodium',                   :require => false if RUBY_VERSION >= '2.2.6'
   gem 'bcrypt_pbkdf',                       :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator',  :require => false, :git => 'https://github.com/skywinder/github-changelog-generator' if RUBY_VERSION >= '2.2.2'
+  gem 'github_changelog_generator',  :require => false, :git => 'https://github.com/github-changelog-generator/github-changelog-generator' if RUBY_VERSION >= '2.2.2'
   gem 'puppet-blacksmith',           :require => false
   gem 'voxpupuli-release',           :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
   gem 'puppet-strings', '>= 1.0',    :require => false
 end
 
 
 
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion.to_s, :require => false, :groups => [:test]
 else
   gem 'facter', :require => false, :groups => [:test]
 end
 
 ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 5.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby