diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80f613c..e2128bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,22 +123,47 @@ rubocop:
 ## Define the rest of the matrix based on Kitchen testing
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
-repositories-debian-10-master-py3: {extends: '.test_instance'}
+# repositories-debian-10-tiamat-py3: {extends: '.test_instance'}
+# repositories-debian-9-tiamat-py3: {extends: '.test_instance'}
+# repositories-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
+# repositories-debian-10-master-py3: {extends: '.test_instance'}
 # preferences-debian-10-master-py3: {extends: '.test_instance'}
 # unattended-debian-10-master-py3: {extends: '.test_instance'}
-# debian-10-master-py3: {extends: '.test_instance'}
-repositories-ubuntu-1804-master-py3: {extends: '.test_instance'}
+debian-10-master-py3: {extends: '.test_instance'}
+# repositories-debian-9-master-py3: {extends: '.test_instance'}
+# preferences-debian-9-master-py3: {extends: '.test_instance'}
+# unattended-debian-9-master-py3: {extends: '.test_instance'}
+debian-9-master-py3: {extends: '.test_instance'}
+# repositories-ubuntu-2004-master-py3: {extends: '.test_instance'}
+# preferences-ubuntu-2004-master-py3: {extends: '.test_instance'}
+# unattended-ubuntu-2004-master-py3: {extends: '.test_instance'}
+ubuntu-2004-master-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# ubuntu-1804-master-py3: {extends: '.test_instance'}
-# repositories-debian-9-2019-2-py3: {extends: '.test_instance'}
-preferences-debian-9-2019-2-py3: {extends: '.test_instance'}
-# unattended-debian-9-2019-2-py3: {extends: '.test_instance'}
-# debian-9-2019-2-py3: {extends: '.test_instance'}
-# repositories-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
-# preferences-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
-unattended-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
-# ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
+ubuntu-1804-master-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1604-master-py3: {extends: '.test_instance'}
+# preferences-ubuntu-1604-master-py3: {extends: '.test_instance'}
+# unattended-ubuntu-1604-master-py3: {extends: '.test_instance'}
+ubuntu-1604-master-py3: {extends: '.test_instance'}
+# repositories-debian-10-3002-2-py3: {extends: '.test_instance'}
+# repositories-debian-9-3002-2-py3: {extends: '.test_instance'}
+# repositories-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
+# repositories-debian-10-3001-4-py3: {extends: '.test_instance'}
+# repositories-debian-9-3001-4-py3: {extends: '.test_instance'}
+# repositories-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
+# repositories-debian-10-3000-6-py3: {extends: '.test_instance'}
+# repositories-debian-9-3000-6-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
+# repositories-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`
diff --git a/.travis.yml b/.travis.yml
index d512087..2513e66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,22 +83,47 @@ jobs:
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
-    - env: INSTANCE=repositories-debian-10-master-py3
+    # - env: INSTANCE=repositories-debian-10-tiamat-py3
+    # - env: INSTANCE=repositories-debian-9-tiamat-py3
+    # - env: INSTANCE=repositories-ubuntu-2004-tiamat-py3
+    # - env: INSTANCE=repositories-ubuntu-1804-tiamat-py3
+    # - env: INSTANCE=repositories-ubuntu-1604-tiamat-py3
+    # - env: INSTANCE=repositories-debian-10-master-py3
     # - env: INSTANCE=preferences-debian-10-master-py3
     # - env: INSTANCE=unattended-debian-10-master-py3
-    # - env: INSTANCE=debian-10-master-py3
-    - env: INSTANCE=repositories-ubuntu-1804-master-py3
+    - env: INSTANCE=debian-10-master-py3
+    # - env: INSTANCE=repositories-debian-9-master-py3
+    # - env: INSTANCE=preferences-debian-9-master-py3
+    # - env: INSTANCE=unattended-debian-9-master-py3
+    - env: INSTANCE=debian-9-master-py3
+    # - env: INSTANCE=repositories-ubuntu-2004-master-py3
+    # - env: INSTANCE=preferences-ubuntu-2004-master-py3
+    # - env: INSTANCE=unattended-ubuntu-2004-master-py3
+    - env: INSTANCE=ubuntu-2004-master-py3
+    # - env: INSTANCE=repositories-ubuntu-1804-master-py3
     # - env: INSTANCE=preferences-ubuntu-1804-master-py3
     # - env: INSTANCE=unattended-ubuntu-1804-master-py3
-    # - env: INSTANCE=ubuntu-1804-master-py3
-    # - env: INSTANCE=repositories-debian-9-2019-2-py3
-    - env: INSTANCE=preferences-debian-9-2019-2-py3
-    # - env: INSTANCE=unattended-debian-9-2019-2-py3
-    # - env: INSTANCE=debian-9-2019-2-py3
-    # - env: INSTANCE=repositories-ubuntu-1804-2019-2-py3
-    # - env: INSTANCE=preferences-ubuntu-1804-2019-2-py3
-    - env: INSTANCE=unattended-ubuntu-1804-2019-2-py3
-    # - env: INSTANCE=ubuntu-1804-2019-2-py3
+    - env: INSTANCE=ubuntu-1804-master-py3
+    # - env: INSTANCE=repositories-ubuntu-1604-master-py3
+    # - env: INSTANCE=preferences-ubuntu-1604-master-py3
+    # - env: INSTANCE=unattended-ubuntu-1604-master-py3
+    - env: INSTANCE=ubuntu-1604-master-py3
+    # - env: INSTANCE=repositories-debian-10-3002-2-py3
+    # - env: INSTANCE=repositories-debian-9-3002-2-py3
+    # - env: INSTANCE=repositories-ubuntu-2004-3002-2-py3
+    # - env: INSTANCE=repositories-ubuntu-1804-3002-2-py3
+    # - env: INSTANCE=repositories-ubuntu-1604-3002-2-py3
+    # - env: INSTANCE=repositories-debian-10-3001-4-py3
+    # - env: INSTANCE=repositories-debian-9-3001-4-py3
+    # - env: INSTANCE=repositories-ubuntu-2004-3001-4-py3
+    # - env: INSTANCE=repositories-ubuntu-1804-3001-4-py3
+    # - env: INSTANCE=repositories-ubuntu-1604-3001-4-py3
+    # - env: INSTANCE=repositories-debian-10-3000-6-py3
+    # - env: INSTANCE=repositories-debian-9-3000-6-py3
+    # - env: INSTANCE=repositories-ubuntu-1804-3000-6-py3
+    # - env: INSTANCE=repositories-ubuntu-1604-3000-6-py3
+    # - env: INSTANCE=repositories-ubuntu-1804-3000-6-py2
+    # - env: INSTANCE=repositories-ubuntu-1604-3000-6-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index 6f7357e..5a035c3 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -8,24 +8,94 @@ driver:
   privileged: true
   run_command: /lib/systemd/systemd
 
-# Make sure the platforms listed below match up with
-# the `env.matrix` instances defined in `.travis.yml`
 platforms:
+  ## SALT `tiamat`
+  - name: debian-10-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:debian-10
+  - name: debian-9-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:debian-9
+  - name: ubuntu-2004-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-20.04
+  - name: ubuntu-1804-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-18.04
+  - name: ubuntu-1604-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-16.04
+
   ## SALT `master`
   - name: debian-10-master-py3
     driver:
       image: saltimages/salt-master-py3:debian-10
+  - name: debian-9-master-py3
+    driver:
+      image: saltimages/salt-master-py3:debian-9
+  - name: ubuntu-2004-master-py3
+    driver:
+      image: saltimages/salt-master-py3:ubuntu-20.04
   - name: ubuntu-1804-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
+  - name: ubuntu-1604-master-py3
+    driver:
+      image: saltimages/salt-master-py3:ubuntu-16.04
 
-  ## SALT `2019.2`
-  - name: debian-9-2019-2-py3
+  ## SALT `3002.2`
+  - name: debian-10-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:debian-10
+  - name: debian-9-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:debian-9
+  - name: ubuntu-2004-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:ubuntu-18.04
+  - name: ubuntu-1604-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:ubuntu-16.04
+
+  ## SALT `3001.4`
+  - name: debian-10-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:debian-10
+  - name: debian-9-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:debian-9
+  - name: ubuntu-2004-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:ubuntu-18.04
+  - name: ubuntu-1604-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:ubuntu-16.04
+
+  ## SALT `3000.6`
+  - name: debian-10-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:debian-10
+  - name: debian-9-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:debian-9
+  - name: ubuntu-1804-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:ubuntu-18.04
+  - name: ubuntu-1604-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:ubuntu-16.04
+  - name: ubuntu-1804-3000-6-py2
     driver:
-      image: saltimages/salt-2019.2-py3:debian-9
-  - name: ubuntu-1804-2019-2-py3
+      image: saltimages/salt-3000.6-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-6-py2
     driver:
-      image: saltimages/salt-2019.2-py3:ubuntu-18.04
+      image: saltimages/salt-3000.6-py2:ubuntu-16.04
 
 provisioner:
   name: salt_solo