diff --git a/spec/acceptance/.beaker-foss.cfg b/spec/acceptance/.beaker-foss.cfg
deleted file mode 100644
index 2fcc581..0000000
--- a/spec/acceptance/.beaker-foss.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   :ssh => {
-       :user_known_hosts_file => '/dev/null'
-   }
-}
diff --git a/spec/acceptance/nodesets/amazonlinux-1-x64.yml b/spec/acceptance/nodesets/amazonlinux-1-x64.yml
deleted file mode 100644
index 21f449a..0000000
--- a/spec/acceptance/nodesets/amazonlinux-1-x64.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-HOSTS:
-  amazonlinux-1-x64:
-    roles:
-      - agent
-      - master
-    platform: el-6-x86_64
-    image: amazonlinux:1
-    hypervisor: docker
-    docker_cmd: ["/sbin/init"]
-    docker_container_name: amazonlinux-1-x64
-    docker_preserve_image: true
-    docker_image_commands:
-      - rm /etc/init/tty.conf
-      - yum install -y java-1.8.0-openjdk-headless rubygems20 tar wget which
diff --git a/spec/acceptance/nodesets/amazonlinux-2-x64.yml b/spec/acceptance/nodesets/amazonlinux-2-x64.yml
deleted file mode 100644
index 2aceb47..0000000
--- a/spec/acceptance/nodesets/amazonlinux-2-x64.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-HOSTS:
-  amazonlinux-2-x64:
-    roles:
-      - agent
-      - master
-    platform: el-7-x86_64
-    image: amazonlinux:2
-    hypervisor: docker
-    docker_cmd: ["/sbin/init"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - yum install -y java-1.8.0-openjdk-headless net-tools wget which cronie iproute
-      - mkdir -p /etc/selinux/targeted/contexts/
-      - echo '<busconfig><selinux></selinux></busconfig>' > /etc/selinux/targeted/contexts/dbus_contexts
-      - rm /lib/systemd/system/systemd*udev*
-      - rm /lib/systemd/system/getty.target
-CONFIG:
-  log_level: warn
diff --git a/spec/acceptance/nodesets/centos-8-x64.yml b/spec/acceptance/nodesets/centos-8-x64.yml
deleted file mode 100644
index 03033d4..0000000
--- a/spec/acceptance/nodesets/centos-8-x64.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-HOSTS:
-  centos-8-x64:
-    roles:
-      - agent
-      - master
-      - database
-      - dashboard
-    platform: el-8-x86_64
-    image: centos:8
-    hypervisor: docker
-    docker_cmd: ["/sbin/init"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - yum install -y wget which cronie iproute
-      # - mkdir -p /etc/selinux/targeted/contexts/
-      # - echo '<busconfig><selinux></selinux></busconfig>' > /etc/selinux/targeted/contexts/dbus_contexts
-      # - rm /lib/systemd/system/systemd*udev*
-      # - rm /lib/systemd/system/getty.target
-CONFIG:
-  log_level: warn
diff --git a/spec/acceptance/nodesets/debian-10-x64.yml b/spec/acceptance/nodesets/debian-10-x64.yml
deleted file mode 100644
index 20faebd..0000000
--- a/spec/acceptance/nodesets/debian-10-x64.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-HOSTS:
-  debian-10:
-    roles:
-      - agent
-    platform: debian-10-amd64
-    image: debian:10
-    hypervisor: docker
-    docker_cmd: ["/bin/systemd"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - apt-get install -yq apt-transport-https wget net-tools gpg ruby-augeas software-properties-common
-      - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
-      - add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
-      - apt update && apt-get install -yq adoptopenjdk-8-hotspot
-CONFIG:
-  log_level: warn
-
diff --git a/spec/acceptance/nodesets/debian-8-x64.yml b/spec/acceptance/nodesets/debian-8-x64.yml
deleted file mode 100644
index 766a414..0000000
--- a/spec/acceptance/nodesets/debian-8-x64.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-HOSTS:
-  debian-8:
-    roles:
-      - agent
-      - master
-      - database
-      - dashboard
-    platform: debian-8-amd64
-    image: debian:8.11
-    hypervisor: docker
-    docker_cmd: ["/bin/systemd"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - echo 'deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main' >> /etc/apt/sources.list
-      - echo 'Acquire::Check-Valid-Until "false";' >> /etc/apt/apt.conf
-      - sed -i '/jessie.updates/d' /etc/apt/sources.list
-      - apt-get update
-      - apt-get install -yq -t jessie-backports openjdk-8-jre-headless
-      - apt-get install -yq wget net-tools apt-transport-https
-      - rm /lib/systemd/system/systemd*udev*
-      - rm /lib/systemd/system/getty.target
-CONFIG:
-  log_level: warn
diff --git a/spec/acceptance/nodesets/debian-9-x64.yml b/spec/acceptance/nodesets/debian-9-x64.yml
deleted file mode 100644
index 238d589..0000000
--- a/spec/acceptance/nodesets/debian-9-x64.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-HOSTS:
-  debian-9:
-    roles:
-      - agent
-    platform: debian-9-amd64
-    image: debian:9
-    hypervisor: docker
-    docker_cmd: ["/bin/systemd"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - apt-get install -yq apt-transport-https openjdk-8-jre-headless wget net-tools gpg ruby-augeas
-CONFIG:
-  log_level: warn
-
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 120000
index c1489c8..0000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu-server-1604-x64.yml
\ No newline at end of file
diff --git a/spec/acceptance/nodesets/oracle-6-x64.yml b/spec/acceptance/nodesets/oracle-6-x64.yml
deleted file mode 100644
index f492d67..0000000
--- a/spec/acceptance/nodesets/oracle-6-x64.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-HOSTS:
-  centos-6-x64:
-    roles:
-      - agent
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    image: oraclelinux:6
-    hypervisor: docker
-    docker_cmd: ["/sbin/init"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - yum install -y tar wget which java-1.8.0-openjdk-headless
-      - rm /etc/init/tty.conf
-      - echo -e "elasticsearch hard nproc 4096\nelasticsearch soft nproc 4096" >> /etc/security/limits.conf
-      - echo -e "esuser hard nproc 4096\nesuser soft nproc 4096" >> /etc/security/limits.conf
-CONFIG:
-  log_level: warn
diff --git a/spec/acceptance/nodesets/oracle-7-x64.yml b/spec/acceptance/nodesets/oracle-7-x64.yml
deleted file mode 100644
index 43c777f..0000000
--- a/spec/acceptance/nodesets/oracle-7-x64.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-HOSTS:
-  oracle-7-x64:
-    roles:
-      - agent
-      - master
-      - database
-      - dashboard
-    platform: el-7-x86_64
-    image: oraclelinux:7
-    hypervisor: docker
-    docker_cmd: ["/sbin/init"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - yum install -y wget which cronie
-      - mkdir -p /etc/selinux/targeted/contexts/
-      - echo '<busconfig><selinux></selinux></busconfig>' > /etc/selinux/targeted/contexts/dbus_contexts
-      - rm /lib/systemd/system/systemd*udev*
-      - rm /lib/systemd/system/getty.target
-CONFIG:
-  log_level: warn
diff --git a/spec/acceptance/nodesets/sles-11-x64.yml b/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 80f8309..0000000
--- a/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-HOSTS:
-  sles-11-x64:
-    roles:
-      - agent
-      - master
-      - database
-      - dashboard
-    platform: sles-11-x64
-    image: dliappis/sles:11sp4
-    hypervisor: docker
-    docker_cmd: ["/sbin/init"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - gem uninstall puppet hiera
-      - zypper install -y augeas augeas-lenses pkgconfig
-      - mkdir -p /etc/puppetlabs/code /etc/puppet/modules
-      - ln -sf /etc/puppet/modules /etc/puppetlabs/code/modules
-CONFIG:
-  log_level: warn
diff --git a/spec/acceptance/nodesets/sles-12-x64.yml b/spec/acceptance/nodesets/sles-12-x64.yml
deleted file mode 100644
index a2c5cc0..0000000
--- a/spec/acceptance/nodesets/sles-12-x64.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-HOSTS:
-  sles-12-x64:
-    roles:
-      - agent
-      - master
-      - database
-      - dashboard
-    platform: sles-12-x86_64
-    image: dliappis/sles:12
-    hypervisor: docker
-    docker_cmd: ["/sbin/init"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - rm /etc/zypp/repos.d/devel_languages_python.repo
-      - gem uninstall -x puppet hiera
-      - zypper clean -a
-      - zypper install --force-resolution -y augeas which
-      - ln -s /usr/lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service
-CONFIG:
-  log_level: warn
diff --git a/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml
deleted file mode 100644
index 16b3bcc..0000000
--- a/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-HOSTS:
-  ubuntu-18-04:
-    roles:
-      - agent
-      - master
-      - database
-      - dashboard
-    platform: ubuntu-18.04-amd64
-    image: ubuntu:18.04
-    hypervisor: docker
-    docker_cmd: ["/sbin/init"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - apt-get update
-      - apt-get install -yq libssl-dev apt-transport-https openjdk-8-jdk iproute2
-CONFIG:
-  log_level: warn
diff --git a/spec/acceptance/nodesets/ubuntu-server-2004-x64.yml b/spec/acceptance/nodesets/ubuntu-server-2004-x64.yml
deleted file mode 100644
index c0b13f5..0000000
--- a/spec/acceptance/nodesets/ubuntu-server-2004-x64.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-HOSTS:
-  ubuntu-20-04:
-    roles:
-      - agent
-      - master
-      - database
-      - dashboard
-    platform: ubuntu-20.04-amd64
-    image: ubuntu:20.04
-    hypervisor: docker
-    docker_cmd: ["/sbin/init"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - apt-get update
-      - apt-get install -yq libssl-dev apt-transport-https openjdk-8-jdk iproute2
-CONFIG:
-  log_level: warn