diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 0000000..7899de8
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,3 @@
+---
+skip-changelog:
+ - head-branch: ['^release-*', 'release']
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76bc72f..7ec4050 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,12 @@
 
 name: CI
 
-"on": pull_request
+"on":
+  pull_request: {}
+  push:
+    branches:
+      - main
+      - master
 
 concurrency:
   group: ${{ github.ref_name }}
@@ -13,6 +18,4 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
-    with:
-      pidfile_workaround: 'false'
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
diff --git a/.github/workflows/pr_labels.yaml b/.github/workflows/pr_labels.yaml
index ea85205..539795e 100644
--- a/.github/workflows/pr_labels.yaml
+++ b/.github/workflows/pr_labels.yaml
@@ -11,4 +11,4 @@ jobs:
         with:
           mode: "exactly"
           count: 1
-          labels: "enhancement, bug, skip-changelog"
+          labels: "enhancement, bug, skip-changelog, backwards-incompatible"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3a4f35d..3153ba8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ name: Release
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
     with:
       allowed_owner: 'lsst-it'
     secrets:
diff --git a/.gitignore b/.gitignore
index 84fd904..adea1b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
 .*.sw?
 /.yardoc/
 /Guardfile
+bolt-debug.log
+.rerun.json
diff --git a/.msync.yml b/.msync.yml
index dd3e957..3607168 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '7.0.0'
+modulesync_config_version: '9.0.0'
diff --git a/.overcommit.yml b/.overcommit.yml
index d367ada..4ed994c 100644
--- a/.overcommit.yml
+++ b/.overcommit.yml
@@ -43,10 +43,12 @@ PreCommit:
     enabled: true
     description: 'Runs rubocop on modified files only'
     command: ['bundle', 'exec', 'rubocop']
-  PuppetLint:
+  RakeTarget:
     enabled: true
-    description: 'Runs puppet-lint on modified files only'
-    command: ['bundle', 'exec', 'puppet-lint']
+    description: 'Runs lint on modified files only'
+    targets:
+      - 'lint'
+    command: ['bundle', 'exec', 'rake']
   YamlSyntax:
     enabled: true
   JsonSyntax:
diff --git a/.pmtignore b/.pmtignore
index 58a0408..10b9830 100644
--- a/.pmtignore
+++ b/.pmtignore
@@ -35,3 +35,4 @@
 /.yardoc/
 /.yardopts
 /Dockerfile
+/HISTORY.md
diff --git a/.rspec b/.rspec
deleted file mode 100644
index f634583..0000000
--- a/.rspec
+++ /dev/null
@@ -1,5 +0,0 @@
-# Managed by modulesync - DO NOT EDIT
-# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
-
---format documentation
---color
diff --git a/.rspec_parallel b/.rspec_parallel
deleted file mode 100644
index a9a84f8..0000000
--- a/.rspec_parallel
+++ /dev/null
@@ -1,4 +0,0 @@
-# Managed by modulesync - DO NOT EDIT
-# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
-
---format progress
diff --git a/Gemfile b/Gemfile
index 86f30c7..d44198d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 7.0',               :require => false
+  gem 'voxpupuli-test', '~> 8.0',               :require => false
   gem 'coveralls',                              :require => false
   gem 'simplecov-console',                      :require => false
-  gem 'puppet_metadata', '~> 3.0',              :require => false
+  gem 'puppet_metadata', '~> 4.0',              :require => false
   gem 'puppet-lint-package_ensure-check',       :require => false
   gem 'puppet-lint-resource_reference_syntax',  :require => false
   gem 'puppet-lint-strict_indent-check',        :require => false
@@ -21,13 +21,11 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
-  gem 'voxpupuli-release', '~> 3.0',              :require => false
-  gem 'faraday-retry', '~> 2.1',                  :require => false
+  gem 'voxpupuli-release', '~> 3.0',  :require => false
 end
 
 gem 'rake', :require => false
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9efb4ae..58c9b66 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,6 +9,10 @@
 
 require 'voxpupuli/test/spec_helper'
 
+RSpec.configure do |c|
+  c.facterdb_string_keys = false
+end
+
 add_mocked_facts!
 
 if File.exist?(File.join(__dir__, 'default_module_facts.yml'))