diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8b006d1a2..01c2fd7a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
+    uses: evgeni/gha-puppet/.github/workflows/beaker.yml@podman
     with:
-      pidfile_workaround: 'false'
       beaker_facter: 'zabbix_version:Zabbix:5.0,6.0'
+      beaker_hypervisor: 'docker_podman'
diff --git a/Gemfile b/Gemfile
index ab83b235d..d46e15be2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,8 @@ group :development do
 end
 
 group :system_tests do
+  gem 'beaker-hostgenerator', git: 'https://github.com/bastelfreak/beaker-hostgenerator', branch: 'podman'
+  gem 'beaker-docker', git: 'https://github.com/bastelfreak/beaker-docker', branch: 'foo'
   gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 6d8f82bda..5582d6745 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -6,7 +6,7 @@
   # In Puppet 7 the locale ends up being C.UTF-8 if it isn't passed.
   # This locale doesn't exist in EL7 and won't be supported either.
   # At least PostgreSQL runs into this.
-  ENV['LANG'] = 'en_US.UTF-8' if host['hypervisor'] == 'docker' && host['platform'] == 'el-7-x86_64'
+  ENV['LANG'] = 'en_US.UTF-8' if host['hypervisor'] =~ 'docker' && host['platform'] == 'el-7-x86_64'
 end
 
 Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }