diff --git a/.travis.yml b/.travis.yml
index eb0f056..bd65cf5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,17 +21,17 @@ env:
     #  - INSTANCE=default-amazonlinux # package install times out
   - INSTANCE=default-centos-6
   - INSTANCE=default-centos-7
-  - INSTANCE=default-debian-8
   - INSTANCE=default-debian-9
-  - INSTANCE=default-ubuntu-1404
+  - INSTANCE=default-debian-10
   - INSTANCE=default-ubuntu-1604
+  - INSTANCE=default-ubuntu-1804
     #- INSTANCE=canonical-amazonlinux
   - INSTANCE=canonical-centos-6
   - INSTANCE=canonical-centos-7
-  - INSTANCE=canonical-debian-8
   - INSTANCE=canonical-debian-9
-  - INSTANCE=canonical-ubuntu-1404
+  - INSTANCE=canonical-debian-10
   - INSTANCE=canonical-ubuntu-1604
+  - INSTANCE=canonical-ubuntu-1804
 
 before_script:
   - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
@@ -44,4 +44,6 @@ matrix:
   include:
     - script:
       - delivery local all
-    
+      env:
+        - UNIT_AND_LINT=1
+        - CHEF_LICENSE=accept
diff --git a/chefignore b/chefignore
index cd4830c..6ee857c 100644
--- a/chefignore
+++ b/chefignore
@@ -45,22 +45,21 @@ a.out
 
 # Testing #
 ###########
-.watchr
 .rspec
 spec/*
 spec/fixtures/*
 test/*
 features/*
 examples/*
-Guardfile
 Procfile
 .kitchen*
+kitchen*
 .rubocop.yml
 spec/*
-Rakefile
 .travis.yml
 .foodcritic
-.codeclimate.yml
+appveyor.yml
+Rakefile
 
 # SCM #
 #######
@@ -92,15 +91,3 @@ Policyfile.lock.json
 CONTRIBUTING*
 CHANGELOG*
 TESTING*
-
-# Strainer #
-############
-Colanderfile
-Strainerfile
-.colander
-.strainer
-
-# Vagrant #
-###########
-.vagrant
-Vagrantfile
diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
index b244df5..33149ea 100644
--- a/kitchen.dokken.yml
+++ b/kitchen.dokken.yml
@@ -20,6 +20,11 @@ platforms:
     image: dokken/amazonlinux
     pid_one_command: /sbin/init
 
+- name: amazonlinux-2
+  driver:
+    image: dokken/amazonlinux-2
+    pid_one_command: /usr/lib/systemd/systemd
+
 - name: debian-9
   driver:
     image: dokken/debian-9
@@ -37,13 +42,16 @@ platforms:
 - name: centos-6
   driver:
     image: dokken/centos-6
-    platform: rhel
     pid_one_command: /sbin/init
 
 - name: centos-7
   driver:
     image: dokken/centos-7
-    platform: rhel
+    pid_one_command: /usr/lib/systemd/systemd
+
+- name: centos-8
+  driver:
+    image: dokken/centos-8
     pid_one_command: /usr/lib/systemd/systemd
 
 - name: fedora-latest
@@ -51,13 +59,6 @@ platforms:
     image: dokken/fedora-latest
     pid_one_command: /usr/lib/systemd/systemd
 
-- name: ubuntu-14.04
-  driver:
-    image: dokken/ubuntu-14.04
-    pid_one_command: /sbin/init
-    intermediate_instructions:
-      - RUN /usr/bin/apt-get update
-
 - name: ubuntu-16.04
   driver:
     image: dokken/ubuntu-16.04
@@ -65,7 +66,14 @@ platforms:
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
 
-- name: opensuse-leap
+- name: ubuntu-18.04
   driver:
-    image: dokken/opensuse-leap
+    image: dokken/ubuntu-18.04
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+
+- name: opensuse-leap-15
+  driver:
+    image: dokken/opensuse-leap-15
     pid_one_command: /bin/systemd
diff --git a/kitchen.yml b/kitchen.yml
index e656f42..61542e9 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -4,6 +4,7 @@ driver:
 provisioner:
   name: chef_zero
   deprecations_as_errors: true
+  chef_license: accept-no-persist
 
 verifier:
   name: inspec
@@ -12,18 +13,20 @@ platforms:
   - name: amazonlinux
     driver_config:
       box: mvbcoding/awslinux
+  - name: amazonlinux-2
   - name: centos-6
   - name: centos-7
-  - name: debian-10
+  - name: centos-8
+  - name: debian-9
     run_list: apt::default
   - name: debian-10
     run_list: apt::default
-  - name: fedora-26
-  - name: opensuse-leap-42
-  - name: ubuntu-14.04
-    run_list: apt::default
+  - name: fedora-latest
+  - name: opensuse-leap-15
   - name: ubuntu-16.04
     run_list: apt::default
+  - name: ubuntu-18.04
+    run_list: apt::default
 
 suites:
 - name: default