diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1f03a29..268f89de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,6 +14,5 @@ jobs:
     name: Puppet
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
-      pidfile_workaround: 'true'
       rubocop: false
       cache-version: '1'
diff --git a/.sync.yml b/.sync.yml
index f7471265..c23206d3 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,6 +1,4 @@
 ---
-.github/workflows/ci.yml:
-  pidfile_workaround: true
 Gemfile:
   extra:
     - gem: hocon
diff --git a/spec/support/acceptance/puppetserver.rb b/spec/support/acceptance/puppetserver.rb
index e9836b61..450a03bc 100644
--- a/spec/support/acceptance/puppetserver.rb
+++ b/spec/support/acceptance/puppetserver.rb
@@ -1,11 +1,13 @@
 def unsupported_puppetserver
-  case host_inventory['facter']['os']['name']
+  os = host_inventory['facter']['os']
+  case os['family']
   when 'Archlinux'
     true
-  when 'Fedora'
-    true
   when 'Debian'
-    host_inventory['facter']['os']['release']['major'] == '12'
+    os['name'] == 'Debian' && os['release']['major'] == '12'
+  when 'RedHat'
+    # puppetserver uses PIDFile, which breaks on Docker
+    os['name'] == 'Fedora' || (default[:hypervisor] == 'docker' && os['release']['major'] == '8')
   end
 end