diff --git a/spec/acceptance/nodesets/amazonlinux-1-x64.yml b/spec/acceptance/nodesets/amazonlinux-1-x64.yml
index 374f83c..21f449a 100644
--- a/spec/acceptance/nodesets/amazonlinux-1-x64.yml
+++ b/spec/acceptance/nodesets/amazonlinux-1-x64.yml
@@ -1,13 +1,14 @@
 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
index 0f40344..2aceb47 100644
--- a/spec/acceptance/nodesets/amazonlinux-2-x64.yml
+++ b/spec/acceptance/nodesets/amazonlinux-2-x64.yml
@@ -1,17 +1,18 @@
 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-6-x64.yml b/spec/acceptance/nodesets/centos-6-x64.yml
index 9f8acba..40b294b 100644
--- a/spec/acceptance/nodesets/centos-6-x64.yml
+++ b/spec/acceptance/nodesets/centos-6-x64.yml
@@ -1,18 +1,19 @@
 HOSTS:
   centos-6-x64:
     roles:
       - master
+      - agent
       - database
       - dashboard
     platform: el-6-x86_64
     image: centos:6.9
     hypervisor: docker
     docker_cmd: ["/sbin/init"]
     docker_preserve_image: true
     docker_image_commands:
       - yum install -y wget tar 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/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml
index a61cfe3..dc95ee4 100644
--- a/spec/acceptance/nodesets/centos-7-x64.yml
+++ b/spec/acceptance/nodesets/centos-7-x64.yml
@@ -1,19 +1,20 @@
 HOSTS:
   centos-7-x64:
     roles:
+      - agent
       - master
       - database
       - dashboard
     platform: el-7-x86_64
     image: centos:7
     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/centos-8-x64.yml b/spec/acceptance/nodesets/centos-8-x64.yml
index e226824..4c2827f 100644
--- a/spec/acceptance/nodesets/centos-8-x64.yml
+++ b/spec/acceptance/nodesets/centos-8-x64.yml
@@ -1,19 +1,20 @@
 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-8-x64.yml b/spec/acceptance/nodesets/debian-8-x64.yml
index f010972..766a414 100644
--- a/spec/acceptance/nodesets/debian-8-x64.yml
+++ b/spec/acceptance/nodesets/debian-8-x64.yml
@@ -1,22 +1,23 @@
 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/oracle-6-x64.yml b/spec/acceptance/nodesets/oracle-6-x64.yml
index de7c8d9..f492d67 100644
--- a/spec/acceptance/nodesets/oracle-6-x64.yml
+++ b/spec/acceptance/nodesets/oracle-6-x64.yml
@@ -1,18 +1,19 @@
 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
index c868ae7..43c777f 100644
--- a/spec/acceptance/nodesets/oracle-7-x64.yml
+++ b/spec/acceptance/nodesets/oracle-7-x64.yml
@@ -1,19 +1,20 @@
 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
index fd4279d..80f8309 100644
--- a/spec/acceptance/nodesets/sles-11-x64.yml
+++ b/spec/acceptance/nodesets/sles-11-x64.yml
@@ -1,18 +1,19 @@
 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
index fa34b57..a2c5cc0 100644
--- a/spec/acceptance/nodesets/sles-12-x64.yml
+++ b/spec/acceptance/nodesets/sles-12-x64.yml
@@ -1,19 +1,20 @@
 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-1204-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml
deleted file mode 100644
index 827f0ba..0000000
--- a/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-HOSTS:
-  ubuntu-12-04:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: ubuntu-12.04-amd64
-    image: ubuntu:12.04
-    hypervisor: docker
-    docker_cmd: ["/sbin/init"]
-    docker_preserve_image: true
-    docker_image_commands:
-      - apt-get install -yq libssl-dev net-tools
-      - ln -sf /sbin/initctl.distrib /sbin/initctl
-      - locale-gen en_US en_US.UTF-8
-      - dpkg-reconfigure locales
-CONFIG:
-  log_level: warn
diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
index 4db5ccc..6dea31b 100644
--- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@@ -1,23 +1,24 @@
 HOSTS:
   ubuntu-14-04:
     roles:
+      - agent
       - master
       - database
       - dashboard
     platform: ubuntu-14.04-amd64
     image: ubuntu:14.04.5
     hypervisor: docker
     docker_cmd: ["/sbin/init"]
     docker_preserve_image: true
     docker_image_commands:
       - apt-get update
       - apt-get install -yq apt-transport-https libssl-dev software-properties-common
       - add-apt-repository -y ppa:openjdk-r/ppa
       - apt-get update
       - apt-get install -y openjdk-8-jre-headless
       - update-ca-certificates -f
       - ln -sf /sbin/initctl.distrib /sbin/initctl
       - locale-gen en_US en_US.UTF-8
       - dpkg-reconfigure locales
 CONFIG:
   log_level: warn
diff --git a/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml
index 7af781c..7923858 100644
--- a/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml
@@ -1,16 +1,17 @@
 HOSTS:
   ubuntu-16-04:
     roles:
+      - agent
       - master
       - database
       - dashboard
     platform: ubuntu-16.04-amd64
     image: ubuntu:16.04
     hypervisor: docker
     docker_cmd: ["/sbin/init"]
     docker_preserve_image: true
     docker_image_commands:
       - apt-get update
       - apt-get install -yq libssl-dev puppet apt-transport-https
 CONFIG:
   log_level: warn
diff --git a/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml
index 3742654..15aeb0e 100644
--- a/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml
@@ -1,16 +1,17 @@
 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 puppet apt-transport-https
 CONFIG:
   log_level: warn