diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8b29489a2..1f82c4c93 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,6 +19,3 @@ jobs:
   puppet:
     name: Puppet
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
-    with:
-      pidfile_workaround: 'false'
-      unit_runs_on: 'cern-self-hosted'
diff --git a/.msync.yml b/.msync.yml
index ade23f9ea..876cb3b02 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.5.0'
+modulesync_config_version: '8.0.1'
diff --git a/.overcommit.yml b/.overcommit.yml
index d367adaea..4ed994cc5 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/.rspec b/.rspec
deleted file mode 100644
index f634583de..000000000
--- 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 a9a84f852..000000000
--- 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/.sync.yml b/.sync.yml
index daff4c244..92efa843b 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,4 +1,5 @@
 ---
 .github/workflows/ci.yml:
-  timeout_minutes: 60
-  unit_runs_on: 'cern-self-hosted'
+  with:
+    timeout_minutes: 60
+    unit_runs_on: 'cern-self-hosted'
diff --git a/Gemfile b/Gemfile
index a4a3b2043..ec7b4cd33 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', '~> 7.2',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 3.5',  :require => false
+  gem 'puppet_metadata', '~> 4.0',  :require => false
 end
 
 group :development do