diff --git a/config_defaults.yml b/config_defaults.yml
index a758c19b..a0bf4c67 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -8,11 +8,11 @@
     # values will replace @@SET@@ with the docker_sets' value
   - rvm: 2.5.3
     services: docker
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=@@SET@@ BEAKER_HYPERVISOR=docker CHECK=beaker
+    env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=@@SET@@ CHECK=beaker
     bundler_args: --without development release
   - rvm: 2.5.3
     services: docker
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=@@SET@@ BEAKER_HYPERVISOR=docker CHECK=beaker
+    env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=@@SET@@ CHECK=beaker
     bundler_args: --without development release
   includes:
   - rvm: 2.4.4
@@ -49,22 +49,7 @@ Gemfile:
       - gem: overcommit
         version: '>= 0.39.1'
     ':system_tests':
-      - gem: winrm
-      - gem: beaker-rspec
-        version: '>= 6'
-      - gem: serverspec
-      - gem: beaker-hostgenerator
-        version: '>= 1.1.22'
-      - gem: beaker-docker
-      - gem: beaker-puppet
-      - gem: beaker-puppet_install_helper
-      - gem: beaker-module_install_helper
-        require: false
-      - gem: rbnacl
-        version: '>= 4'
-      - gem: rbnacl-libsodium
-      - gem: bcrypt_pbkdf
-      - gem: ed25519
+      - gem: voxpupuli-acceptance
     ':release':
       - gem: github_changelog_generator
         git: https://github.com/voxpupuli/github-changelog-generator
@@ -120,6 +105,8 @@ spec/acceptance/nodesets/windows-2012R2-serverstandard-x64.yml:
   delete: true
 spec/spec_helper.rb:
   mock_with: false
+spec/spec_helper_acceptance.rb:
+  unmanaged: true
 CONTRIBUTING.md:
   delete: true
 ...
diff --git a/moduleroot/spec/spec_helper_acceptance.rb.erb b/moduleroot/spec/spec_helper_acceptance.rb.erb
new file mode 100644
index 00000000..ffbdaf47
--- /dev/null
+++ b/moduleroot/spec/spec_helper_acceptance.rb.erb
@@ -0,0 +1,3 @@
+require 'voxpupuli/acceptance/spec_helper_acceptance'
+
+configure_beaker