diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f81e6abe..fd5042e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,3 +25,5 @@ jobs:
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4
     with:
       beaker_hypervisor: 'docker'
+      pidfile_workaround: 'false'
+      unit_runs_on: 'cern-self-hosted'
diff --git a/.sync.yml b/.sync.yml
index 8708ffec..7407f498 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -10,3 +10,4 @@ spec/spec_helper.rb:
 .github/workflows/ci.yml:
   with:
     beaker_hypervisor: 'docker'
+    unit_runs_on: 'cern-self-hosted'