diff --git a/.sync.yml b/.sync.yml
index b7241dd..5d980e7 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,107 +1,135 @@
 ---
 ".gitlab-ci.yml":
   delete: true
 ".yardopts":
   optional:
   - "--output-dir docs/"
 appveyor.yml:
   delete: true
 Gemfile:
   optional:
     ":development":
     - gem: github_changelog_generator
       git: https://github.com/skywinder/github-changelog-generator
       ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
       condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 spec/spec_helper.rb:
   mock_with: ":rspec"
   coverage_report: true
 '.travis.yml':
   deploy_to_forge:
     enabled: false
   branches:
     - release
   user: puppet
   secure: ''
   includes:
     - bundler_args:
       dist: trusty
       env: PLATFORMS=deb_puppet5
       rvm: 2.5.3
       before_script:
         - bundle exec rake 'litmus:provision_list[travis_deb]'
         - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
         - bundle exec rake 'litmus:install_agent[puppet5]'
         - bundle exec rake litmus:install_module
       script:
         - bundle exec rake litmus:acceptance:parallel
       services: docker
       stage: acceptance
       sudo: required
     - bundler_args:
       dist: trusty
       env: PLATFORM=centos:deb_puppet6
       rvm: 2.5.3
       before_script:
         - bundle exec rake 'litmus:provision_list[travis_deb]'
         - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
         - bundle exec rake 'litmus:install_agent[puppet6]'
         - bundle exec rake litmus:install_module
       script:
         - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
       stage: acceptance
     - bundler_args:
       dist: trusty
-      env: PLATFORMS=el_puppet5
+      env: PLATFORMS=ub_puppet5
       rvm: 2.5.3
       before_script:
-        - bundle exec rake 'litmus:provision_list[travis_el6]'
+        - bundle exec rake 'litmus:provision_list[travis_ub]'
+        - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
         - bundle exec rake 'litmus:install_agent[puppet5]'
         - bundle exec rake litmus:install_module
       script:
         - bundle exec rake litmus:acceptance:parallel
       services: docker
+      stage: acceptance
+      sudo: required
+    - bundler_args:
+      dist: trusty
+      env: PLATFORM=centos:ub_puppet6
+      rvm: 2.5.3
+      before_script:
+        - bundle exec rake 'litmus:provision_list[travis_ub]'
+        - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
+        - bundle exec rake 'litmus:install_agent[puppet6]'
+        - bundle exec rake litmus:install_module
+      script:
+        - bundle exec rake litmus:acceptance:parallel
+      services: docker
       sudo: required
       stage: acceptance
     - bundler_args:
       dist: trusty
-      env: PLATFORMS=el_puppet5
+      env: PLATFORMS=el6_puppet5
       rvm: 2.5.3
       before_script:
-        - bundle exec rake 'litmus:provision_list[travis_el7]'
+        - bundle exec rake 'litmus:provision_list[travis_el6]'
         - bundle exec rake 'litmus:install_agent[puppet5]'
         - bundle exec rake litmus:install_module
       script:
         - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
       stage: acceptance
     - bundler_args:
       dist: trusty
-      env: PLATFORM=centos:el_puppet6
+      env: PLATFORM=centos:el6_puppet6
       rvm: 2.5.3
       before_script:
         - bundle exec rake 'litmus:provision_list[travis_el6]'
         - bundle exec rake 'litmus:install_agent[puppet6]'
         - bundle exec rake litmus:install_module
       script:
         - bundle exec rake litmus:acceptance:parallel
       services: docker
       stage: acceptance
       sudo: required
     - bundler_args:
       dist: trusty
-      env: PLATFORM=centos:el_puppet6
+      env: PLATFORMS=el7_puppet5
+      rvm: 2.5.3
+      before_script:
+        - bundle exec rake 'litmus:provision_list[travis_el7]'
+        - bundle exec rake 'litmus:install_agent[puppet5]'
+        - bundle exec rake litmus:install_module
+      script:
+        - bundle exec rake litmus:acceptance:parallel
+      services: docker
+      sudo: required
+      stage: acceptance
+    - bundler_args:
+      dist: trusty
+      env: PLATFORM=centos:el7_puppet6
       rvm: 2.5.3
       before_script:
         - bundle exec rake 'litmus:provision_list[travis_el7]'
         - bundle exec rake 'litmus:install_agent[puppet6]'
         - bundle exec rake litmus:install_module
       script:
         - bundle exec rake litmus:acceptance:parallel
       services: docker
       stage: acceptance
       sudo: required
   simplecov: true
diff --git a/.travis.yml b/.travis.yml
index 8e16f28..5a8c167 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,111 +1,131 @@
 ---
 dist: xenial
 language: ruby
 cache: bundler
 before_install:
   - bundle -v
   - rm -f Gemfile.lock
   - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
   - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
   - '[ -z "$RUBYGEMS_VERSION" ] || yes | gem update --system $RUBYGEMS_VERSION'
   - gem --version
   - bundle -v
 script:
   - 'SIMPLECOV=yes bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
   - 2.5.3
 stages:
   - static
   - spec
   - acceptance
 matrix:
   fast_finish: true
   include:
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
       stage: static
     -
       env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
       rvm: 2.4.5
       stage: spec
     -
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
       rvm: 2.5.3
       stage: spec
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
       env: PLATFORMS=deb_puppet5
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
-      env: PLATFORM=centos:deb_puppet6
+      env: PLATFORM=deb_puppet6
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+      sudo: required
+    -
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=ub_puppet5
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+      sudo: required
+    -
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
+      dist: trusty
+      env: PLATFORM=ub_puppet6
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
-      env: PLATFORMS=el_puppet5
+      env: PLATFORMS=el6_puppet5
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
       sudo: required
     -
-      before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
-      env: PLATFORMS=el_puppet5
+      env: PLATFORMS=el6_puppet5
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
       sudo: required
     -
-      before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
-      env: PLATFORM=centos:el_puppet6
+      env: PLATFORMS=el7_puppet5
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
       sudo: required
     -
-      before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
-      env: PLATFORM=centos:el_puppet6
+      env: PLATFORMS=el7_puppet5
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
       sudo: required
 branches:
   only:
     - master
     - /^v\d/
     - release
 notifications:
   email: false
 deploy:
   provider: puppetforge
   user: puppet
   password:
     secure: ""
   on:
     tags: true
     all_branches: true
     condition: "$DEPLOY_TO_FORGE = yes"
diff --git a/provision.yaml b/provision.yaml
index b8c2256..9aa8b12 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -1,16 +1,22 @@
 ---
 default:
-  provisioner: docker
-  images: ['centos:7']
+  provisioner: vmpooler
+  images: ['redhat-8-x86_64']
+vagrant:
+  provisioner: vagrant
+  images: ['centos/7', 'generic/ubuntu1804']
 travis_deb:
   provisioner: docker
-  images: ['debian:8', 'debian:9', 'ubuntu:14.04', 'ubuntu:16.04', 'ubuntu:18.04']
+  images: ['debian:8', 'debian:9', 'waffleimage/debian10']
+travis_ub:
+  provisioner: docker
+  images: ['ubuntu:14.04', 'ubuntu:16.04', 'ubuntu:18.04']
 travis_el6:
   provisioner: docker
   images: ['centos:6', 'oraclelinux:6', 'scientificlinux/sl:6']
 travis_el7:
   provisioner: docker
   images: ['centos:7', 'oraclelinux:7', 'scientificlinux/sl:7']
 release_checks:
   provisioner: vmpooler
   images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-5-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64' ]