diff --git a/.gitignore b/.gitignore
index a07114e0f35aa1ecf209c6adc2446b30316723c8..8f93e57772d4529e4846fa285b86454422a34929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,8 +42,6 @@ vendor/
 .coverage/
 .zero-knife.rb
 Policyfile.lock.json
-Cheffile.lock
-.librarian/
 
 # vagrant stuff
 .vagrant/
diff --git a/.travis.yml b/.travis.yml
index f272b7a6531eec4d7081db4fd51abc15a2dc23ec..b80554b346569eedec635f254a49891a16d132c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 sudo: required
-dist: trusty
 
 addons:
   apt:
@@ -19,15 +18,32 @@ services: docker
 
 env:
   matrix:
-  - INSTANCE=default-ubuntu-1604
-  - INSTANCE=default-debian-8
-  - INSTANCE=default-centos-6
-  - INSTANCE=default-centos-7
-  - INSTANCE=default-fedora-latest
-  - INSTANCE=source-ubuntu-1604
-  - INSTANCE=source-debian-8
-  - INSTANCE=source-fedora-latest
-  - INSTANCE=source-centos-7
+  - CHEF_VERSION=13 INSTANCE=default-ubuntu-1604
+  - CHEF_VERSION=13 INSTANCE=default-ubuntu-1804
+  - CHEF_VERSION=13 INSTANCE=default-debian-8
+  - CHEF_VERSION=13 INSTANCE=default-debian-9
+  - CHEF_VERSION=13 INSTANCE=default-centos-6
+  - CHEF_VERSION=13 INSTANCE=default-centos-7
+  - CHEF_VERSION=13 INSTANCE=default-fedora-latest
+  - CHEF_VERSION=13 INSTANCE=source-ubuntu-1604
+  - CHEF_VERSION=13 INSTANCE=source-ubuntu-1804
+  - CHEF_VERSION=13 INSTANCE=source-debian-8
+  - CHEF_VERSION=13 INSTANCE=source-debian-9
+  - CHEF_VERSION=13 INSTANCE=source-fedora-latest
+  - CHEF_VERSION=13 INSTANCE=source-centos-7
+  - CHEF_VERSION=14 INSTANCE=default-ubuntu-1604
+  - CHEF_VERSION=14 INSTANCE=default-ubuntu-1804
+  - CHEF_VERSION=14 INSTANCE=default-debian-8
+  - CHEF_VERSION=14 INSTANCE=default-debian-9
+  - CHEF_VERSION=14 INSTANCE=default-centos-6
+  - CHEF_VERSION=14 INSTANCE=default-centos-7
+  - CHEF_VERSION=14 INSTANCE=default-fedora-latest
+  - CHEF_VERSION=14 INSTANCE=source-ubuntu-1604
+  - CHEF_VERSION=14 INSTANCE=source-ubuntu-1804
+  - CHEF_VERSION=14 INSTANCE=source-debian-8
+  - CHEF_VERSION=14 INSTANCE=source-debian-9
+  - CHEF_VERSION=14 INSTANCE=source-fedora-latest
+  - CHEF_VERSION=14 INSTANCE=source-centos-7
 
 before_script:
   - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
@@ -36,7 +52,7 @@ before_script:
   - cookstyle --version
   - foodcritic --version
 
-script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml kitchen verify ${INSTANCE}
+script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml CHEF_VERSION=${CHEF_VERSION} kitchen verify ${INSTANCE}
 
 matrix:
   include:
diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
index 446d291d99ed607b91413fdf4331a5cf315c2c4e..26b6b384e88977e4220569b678aa83cac1537af1 100644
--- a/kitchen.dokken.yml
+++ b/kitchen.dokken.yml
@@ -19,6 +19,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-8
   driver:
     image: dokken/debian-8
@@ -48,16 +53,16 @@ platforms:
     image: dokken/fedora-latest
     pid_one_command: /usr/lib/systemd/systemd
 
-- name: ubuntu-14.04
+- name: ubuntu-16.04
   driver:
-    image: dokken/ubuntu-14.04
-    pid_one_command: /sbin/init
+    image: dokken/ubuntu-16.04
+    pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
 
-- name: ubuntu-16.04
+- name: ubuntu-18.04
   driver:
-    image: dokken/ubuntu-16.04
+    image: dokken/ubuntu-18.04
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
diff --git a/kitchen.yml b/kitchen.yml
index 79c4bf73b74473cb0251c3bf8f7ff2449132beb4..aa19fe27fcaceb2bd553778653fe4748053a6e69 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -3,8 +3,12 @@ driver:
 
 provisioner:
   name: chef_zero
+  deprecations_as_errors: true
 
 platforms:
+  - name: amazonlinux
+    driver_config:
+      box: mvbcoding/awslinux
   - name: centos-6
   - name: centos-7
   - name: debian-8
@@ -15,6 +19,8 @@ platforms:
   - name: opensuse-leap-42
   - name: ubuntu-16.04
     run_list: apt::default
+  - name: ubuntu-18.04
+    run_list: apt::default
 
 suites:
 - name: default
@@ -37,7 +43,7 @@ suites:
     - recipe[erlang::esl]
   excludes:
     - fedora-28
-    - opensuse-42
+    - opensuse-leap-42
 
 - name: source
   run_list: