diff --git a/.msync.yml b/.msync.yml
index a4b0069..b929160 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: '5.5.0'
+modulesync_config_version: '6.0.0'
diff --git a/Gemfile b/Gemfile
index 15313c3..978c57f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.4',   :require => false
+  gem 'voxpupuli-test', '~> 6.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 2.0',  :require => false
+  gem 'puppet_metadata', '~> 3.0',  :require => false
 end
 
 group :development do
@@ -16,18 +16,19 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
 end
 
 group :release do
   gem 'github_changelog_generator', '>= 1.16.1',  :require => false if RUBY_VERSION >= '2.5'
-  gem 'voxpupuli-release', '~> 2.0',              :require => false
+  gem 'voxpupuli-release', '~> 3.0',              :require => false
+  gem 'faraday-retry', '~> 2.1',                  :require => false
 end
 
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby
diff --git a/spec/acceptance/hiera_spec.rb b/spec/acceptance/hiera_spec.rb
index 2bac176..26adb79 100644
--- a/spec/acceptance/hiera_spec.rb
+++ b/spec/acceptance/hiera_spec.rb
@@ -84,7 +84,7 @@ class myclass {
 
     it 'finds it in puppet agent' do
       make_site_pp(default, pp, manifestsdir)
-      expect(on(default, puppet('agent', '-t', '--server', '$(hostname -f)'), acceptable_exit_codes: [0, 2]).stdout.strip).to match(%r{found output})
+      expect(on(default, 'puppet agent -t --server $(hostname -f)', acceptable_exit_codes: [0, 2]).stdout.strip).to match(%r{found output})
     end
   end
 end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 40b745a..085099c 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -3,10 +3,10 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
 configure_beaker do |host|
-  install_module_from_forge_on(host, 'puppetlabs-puppetserver_gem', '>= 0')
+  install_puppet_module_via_pmt_on(host, 'puppetlabs-puppetserver_gem')
   unless ENV['BEAKER_provision'] == 'no'
     install_package(host, 'puppetserver')
-    on host, puppet('resource', 'service', 'puppetserver', 'ensure=running')
+    on host, 'puppet resource service puppetserver ensure=running'
   end
 end
 
@@ -26,7 +26,7 @@ def wait_for_puppetserver(host, max_retries)
 def make_site_pp(host, pp, path)
   on host, "mkdir -p #{path}"
   create_remote_file(host, File.join(path, 'site.pp'), pp)
-  on host, "chown -R #{puppet_user(host)}:#{puppet_group(host)} #{path}"
+  on host, "chown -R puppet:puppet #{path}"
   on host, "chmod -R 0755 #{path}"
   on host, 'service puppetserver restart'
   wait_for_puppetserver(host, 3)