diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3e46cf..afe68f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,4 +13,6 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
+    with:
+      pidfile_workaround: 'false'
diff --git a/.mdl_style.rb b/.mdl_style.rb
index d524fcb..55e6b1e 100644
--- a/.mdl_style.rb
+++ b/.mdl_style.rb
@@ -4,6 +4,5 @@
 rule "MD013", :code_blocks => false
 exclude_rule "MD003"
 exclude_rule "MD013"
-exclude_rule "MD024"
-exclude_rule "MD034"
 exclude_rule "MD036"
+exclude_rule "MD034"
diff --git a/.rubocop.yml b/.rubocop.yml
index 1753a88..53ac189 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,5 +4,3 @@
 
 inherit_gem:
   voxpupuli-test: rubocop.yml
-RSpec/BeforeAfterAll:
-  Enabled: false