diff --git a/Gemfile b/Gemfile
index c97c210..2eeba58 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,16 +3,15 @@
 
 source 'https://rubygems.org'
 
-gem 'puppet', ENV.fetch('PUPPET_GEM_VERSION', '>= 7'), groups: ['development', 'test']
+gem 'openvox', ENV.fetch('PUPPET_GEM_VERSION', '>= 8')
 gem 'rake'
 
-gem 'kafo_module_lint', {"groups"=>["test"]}
-gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]}
-gem 'voxpupuli-test', '~> 9.0', {"groups"=>["test"]}
-gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
-gem 'puppet_metadata', '~> 5.3'
-gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
-gem 'voxpupuli-acceptance', '~> 4.1', {"groups"=>["system_tests"]}
-gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
+gem 'kafo_module_lint', {"groups" => ["test"]}
+gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 2.0', {"groups" => ["test"]}
+gem 'voxpupuli-test', '~> 14.0', {"groups" => ["test"]}
+gem 'github_changelog_generator', '>= 1.15.0', {"groups" => ["development"]}
+gem 'puppet_metadata', '~> 6.3'
+gem 'puppet-blacksmith', '~> 9.1', {"groups" => ["development"]}
+gem 'voxpupuli-acceptance', '~> 4.4', {"groups" => ["system_tests"]}
 
 # vim:ft=ruby
diff --git a/Rakefile b/Rakefile
index c182b84..106b6a3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,10 +6,6 @@
 begin
   require 'voxpupuli/test/rake'
 rescue LoadError
-  begin
-    require 'puppetlabs_spec_helper/rake_tasks'
-  rescue LoadError
-  end
 end
 
 # load optional tasks for acceptance
@@ -19,7 +15,7 @@ begin
 rescue LoadError
 else
   # We use fixtures in our modules, which is not the default
-  task :beaker => 'spec_prep'
+  task :beaker => 'fixtures:prep'
 end
 
 # blacksmith isn't always present, e.g. on Travis with --without development
diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb
index bd1decf..4446860 100644
--- a/spec/classes/application_spec.rb
+++ b/spec/classes/application_spec.rb
@@ -80,14 +80,9 @@ class { 'katello::repo':
 
         it { is_expected.to compile.with_all_deps }
 
-        let(:katello_yaml_content) do
-          [
-            '  :rest_client_timeout: 4000',
-          ]
-        end
-
         it 'should generate correct katello.yaml' do
-          verify_contents(catalogue, '/etc/foreman/plugins/katello.yaml', katello_yaml_content)
+          is_expected.to contain_file('/etc/foreman/plugins/katello.yaml')
+            .with_content(/^  :rest_client_timeout: 4000$/)
         end
       end
 
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index bdf14c4..54bb901 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,6 +1,6 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-ENV['BEAKER_setfile'] ||= 'centos8-64{hostname=centos8-64.example.com}'
+ENV['BEAKER_setfile'] ||= 'centos9-64{hostname=centos9-64.example.com}'
 
 configure_beaker(modules: :fixtures) do |host|
   if fact_on(host, 'os.family') == 'RedHat'