diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b1971f432..70e2cff61 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,4 +13,7 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
+    with:
+      pidfile_workaround: 'false'
+      beaker_facter: 'zabbix_version:Zabbix:5.0,6.0'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 15f172134..55324aa62 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ on:
 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: 'voxpupuli'
     secrets:
diff --git a/.msync.yml b/.msync.yml
index dd3e95722..76cd46468 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: '7.1.0'
diff --git a/.sync.yml b/.sync.yml
index bd04910b5..bfddc3ac5 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -12,3 +12,5 @@ spec/spec_helper.rb:
 .puppet-lint.rc:
   enabled_lint_checks:
     - parameter_documentation
+.github/workflows/ci.yml:
+  beaker_facter: 'zabbix_version:Zabbix:5.0,6.0'
diff --git a/Gemfile b/Gemfile
index fc243de77..6de843be6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ group :test do
   gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 3.0',  :require => false
+  gem 'puppet_metadata', '~> 3.5',  :require => false
   gem 'fakefs',                     :require => false
   gem 'zabbixapi',                  :require => false
 end
@@ -18,13 +18,11 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 2.2',  :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/support/acceptance/supported_versions.rb b/spec/support/acceptance/supported_versions.rb
index 6e5c5f3b1..47017f7f8 100644
--- a/spec/support/acceptance/supported_versions.rb
+++ b/spec/support/acceptance/supported_versions.rb
@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
 def supported_versions
-  %w[5.0 6.0]
+  supported_versions = %w[5.0 6.0]
+  # this is a hack so that we don't have to rewrite the existing acceptance tests
+  if (beaker_zabbix_version = ENV.fetch('BEAKER_FACTER_zabbix_version', nil))
+    supported_versions &= [beaker_zabbix_version]
+    raise "Unsupported version: #{beaker_zabbix_version}" if supported_versions.empty?
+  end
+  supported_versions
 end