diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6a4447..2813f2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,37 +123,81 @@ 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`
+# default-debian-10-tiamat-py3: {extends: '.test_instance'}
+# default-debian-9-tiamat-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
+# default-centos-8-tiamat-py3: {extends: '.test_instance'}
+# default-centos-7-tiamat-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
 default-debian-10-master-py3: {extends: '.test_instance'}
+default-debian-9-master-py3: {extends: '.test_instance'}
 default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 default-ubuntu-1804-master-py3: {extends: '.test_instance'}
+default-ubuntu-1604-master-py3: {extends: '.test_instance'}
 default-centos-8-master-py3: {extends: '.test_instance'}
+default-centos-7-master-py3: {extends: '.test_instance'}
+# default-fedora-33-master-py3: {extends: '.test_instance'}
 # default-fedora-32-master-py3: {extends: '.test_instance'}
-# default-fedora-31-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
-# default-debian-10-3000-3-py3: {extends: '.test_instance'}
-# default-debian-9-3000-3-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
-# default-centos-8-3000-3-py3: {extends: '.test_instance'}
-default-centos-7-3000-3-py3: {extends: '.test_instance'}
-# default-fedora-31-3000-3-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3000-3-py3: {extends: '.test_instance'}
-default-amazonlinux-2-3000-3-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
-# default-ubuntu-1604-3000-3-py2: {extends: '.test_instance'}
-# default-arch-base-latest-3000-3-py2: {extends: '.test_instance'}
-# default-debian-10-2019-2-py3: {extends: '.test_instance'}
-# default-debian-9-2019-2-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-2019-2-py3: {extends: '.test_instance'}
-# default-centos-8-2019-2-py3: {extends: '.test_instance'}
-# default-centos-7-2019-2-py3: {extends: '.test_instance'}
-# default-fedora-31-2019-2-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-2019-2-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
-# default-centos-6-2019-2-py2: {extends: '.test_instance'}
-# default-amazonlinux-1-2019-2-py2: {extends: '.test_instance'}
-# default-arch-base-latest-2019-2-py2: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+default-amazonlinux-2-master-py3: {extends: '.test_instance'}
+default-oraclelinux-8-master-py3: {extends: '.test_instance'}
+default-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
+# default-debian-10-3002-2-py3: {extends: '.test_instance'}
+# default-debian-9-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
+# default-centos-8-3002-2-py3: {extends: '.test_instance'}
+# default-centos-7-3002-2-py3: {extends: '.test_instance'}
+# default-fedora-33-3002-2-py3: {extends: '.test_instance'}
+# default-fedora-32-3002-2-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
+# default-debian-10-3001-4-py3: {extends: '.test_instance'}
+# default-debian-9-3001-4-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
+# default-centos-8-3001-4-py3: {extends: '.test_instance'}
+# default-centos-7-3001-4-py3: {extends: '.test_instance'}
+# default-fedora-33-3001-4-py3: {extends: '.test_instance'}
+# default-fedora-32-3001-4-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
+# default-debian-10-3000-6-py3: {extends: '.test_instance'}
+# default-debian-9-3000-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
+# default-centos-8-3000-6-py3: {extends: '.test_instance'}
+# default-centos-7-3000-6-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
+# default-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..5730c9d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,198 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+################################################################################
+# NOTE: This file is UNMAINTAINED; it is provided for references purposes only.
+#       No guarantees are tendered that this structure will work after 2020.
+################################################################################
+# * https://en.wikipedia.org/wiki/Travis_CI:
+#   - "... free open-source plans were removed in [sic] the end of 2020"
+#   - https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing
+#   - https://ropensci.org/technotes/2020/11/19/moving-away-travis/
+################################################################################
+## Machine config
+os: 'linux'
+arch: 'amd64'
+dist: 'bionic'
+version: '~> 1.0'
+
+## Language and cache config
+language: 'ruby'
+cache: 'bundler'
+
+## Services config
+services:
+  - docker
+
+## Script to run for the test stage
+script:
+  - bin/kitchen verify "${INSTANCE}"
+
+## Stages and jobs matrix
+stages:
+  - test
+  # # As part of the switch away from Travis CI, ensure that the `release` stage
+  # # is not run inadvertently
+  # - name: 'release'
+  #   if: 'branch = master AND type != pull_request'
+jobs:
+  include:
+    ## Define the test stage that runs the linters (and testing matrix, if applicable)
+
+    # Run all of the linters in a single job
+    - language: 'node_js'
+      node_js: 'lts/*'
+      env: 'Lint'
+      name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint'
+      before_install: 'skip'
+      script:
+        # Install and run `salt-lint`
+        - pip install --user salt-lint
+        - git ls-files -- '*.sls' '*.jinja' '*.j2' '*.tmpl' '*.tst'
+                        | xargs salt-lint
+        # Install and run `yamllint`
+        # Need at least `v1.17.0` for the `yaml-files` setting
+        - pip install --user yamllint>=1.17.0
+        - yamllint -s .
+        # Install and run `rubocop`
+        - gem install rubocop
+        - rubocop -d
+        # Run `shellcheck` (already pre-installed in Travis)
+        - shellcheck --version
+        - git ls-files -- '*.sh' '*.bash' '*.ksh'
+                        | xargs shellcheck
+        # Install and run `commitlint`
+        - npm i -D @commitlint/config-conventional
+                   @commitlint/travis-cli
+        - commitlint-travis
+
+    # Run `pre-commit` linters in a single job
+    - language: 'python'
+      env: 'Lint_pre-commit'
+      name: 'Lint: pre-commit'
+      before_install: 'skip'
+      cache:
+        directories:
+          - $HOME/.cache/pre-commit
+      script:
+        # Install and run `pre-commit`
+        - pip install pre-commit==2.7.1
+        - pre-commit run --all-files --color always --verbose
+        - pre-commit run --color always --hook-stage manual --verbose commitlint-travis
+
+    ## 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=default-debian-10-tiamat-py3
+    # - env: INSTANCE=default-debian-9-tiamat-py3
+    # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
+    # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
+    # - env: INSTANCE=default-ubuntu-1604-tiamat-py3
+    # - env: INSTANCE=default-centos-8-tiamat-py3
+    # - env: INSTANCE=default-centos-7-tiamat-py3
+    # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
+    # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
+    # - env: INSTANCE=default-oraclelinux-7-tiamat-py3
+    - env: INSTANCE=default-debian-10-master-py3
+    - env: INSTANCE=default-debian-9-master-py3
+    - env: INSTANCE=default-ubuntu-2004-master-py3
+    - env: INSTANCE=default-ubuntu-1804-master-py3
+    - env: INSTANCE=default-ubuntu-1604-master-py3
+    - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=default-centos-7-master-py3
+    # - env: INSTANCE=default-fedora-33-master-py3
+    # - env: INSTANCE=default-fedora-32-master-py3
+    # - env: INSTANCE=default-opensuse-leap-152-master-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
+    - env: INSTANCE=default-amazonlinux-2-master-py3
+    - env: INSTANCE=default-oraclelinux-8-master-py3
+    - env: INSTANCE=default-oraclelinux-7-master-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
+    # - env: INSTANCE=default-debian-10-3002-2-py3
+    # - env: INSTANCE=default-debian-9-3002-2-py3
+    # - env: INSTANCE=default-ubuntu-2004-3002-2-py3
+    # - env: INSTANCE=default-ubuntu-1804-3002-2-py3
+    # - env: INSTANCE=default-ubuntu-1604-3002-2-py3
+    # - env: INSTANCE=default-centos-8-3002-2-py3
+    # - env: INSTANCE=default-centos-7-3002-2-py3
+    # - env: INSTANCE=default-fedora-33-3002-2-py3
+    # - env: INSTANCE=default-fedora-32-3002-2-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
+    # - env: INSTANCE=default-amazonlinux-2-3002-2-py3
+    # - env: INSTANCE=default-oraclelinux-8-3002-2-py3
+    # - env: INSTANCE=default-oraclelinux-7-3002-2-py3
+    # - env: INSTANCE=default-arch-base-latest-3002-2-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3002-2-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3002-2-py3
+    # - env: INSTANCE=default-debian-10-3001-4-py3
+    # - env: INSTANCE=default-debian-9-3001-4-py3
+    # - env: INSTANCE=default-ubuntu-2004-3001-4-py3
+    # - env: INSTANCE=default-ubuntu-1804-3001-4-py3
+    # - env: INSTANCE=default-ubuntu-1604-3001-4-py3
+    # - env: INSTANCE=default-centos-8-3001-4-py3
+    # - env: INSTANCE=default-centos-7-3001-4-py3
+    # - env: INSTANCE=default-fedora-33-3001-4-py3
+    # - env: INSTANCE=default-fedora-32-3001-4-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3001-4-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-4-py3
+    # - env: INSTANCE=default-amazonlinux-2-3001-4-py3
+    # - env: INSTANCE=default-oraclelinux-8-3001-4-py3
+    # - env: INSTANCE=default-oraclelinux-7-3001-4-py3
+    # - env: INSTANCE=default-arch-base-latest-3001-4-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3001-4-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-4-py3
+    # - env: INSTANCE=default-debian-10-3000-6-py3
+    # - env: INSTANCE=default-debian-9-3000-6-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-6-py3
+    # - env: INSTANCE=default-ubuntu-1604-3000-6-py3
+    # - env: INSTANCE=default-centos-8-3000-6-py3
+    # - env: INSTANCE=default-centos-7-3000-6-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3000-6-py3
+    # - env: INSTANCE=default-amazonlinux-2-3000-6-py3
+    # - env: INSTANCE=default-oraclelinux-8-3000-6-py3
+    # - env: INSTANCE=default-oraclelinux-7-3000-6-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3000-6-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3000-6-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-6-py2
+    # - env: INSTANCE=default-ubuntu-1604-3000-6-py2
+    # - env: INSTANCE=default-arch-base-latest-3000-6-py2
+
+    ## Define the release stage that runs `semantic-release`
+    - stage: 'release'
+      language: 'node_js'
+      node_js: 'lts/*'
+      env: 'Release'
+      name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
+      before_install: 'skip'
+      script:
+        # Update `AUTHORS.md`
+        - export MAINTAINER_TOKEN=${GH_TOKEN}
+        - go get github.com/myii/maintainer
+        - maintainer contributor
+
+        # Install all dependencies required for `semantic-release`
+        - npm i -D @semantic-release/changelog@3
+                   @semantic-release/exec@3
+                   @semantic-release/git@7
+      deploy:
+        provider: 'script'
+        # Opt-in to `dpl v2` to complete the Travis build config validation (beta)
+        # * https://docs.travis-ci.com/user/build-config-validation
+        # Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default
+        edge: true
+        # Run `semantic-release`
+        script: 'npx semantic-release@15.14'
+
+# Notification options: `always`, `never` or `change`
+notifications:
+  webhooks:
+    if: 'repo = saltstack-formulas/nifi-formula'
+    urls:
+      - https://saltstack-formulas.zulipchat.com/api/v1/external/travis?api_key=HsIq3o5QmLxdnVCKF9is0FUIpkpAY79P&stream=CI&topic=saltstack-formulas%2Fnifi-formula&ignore_pull_requests=true
+    on_success: always  # default: always
+    on_failure: always  # default: always
+    on_start: always    # default: never
+    on_cancel: always   # default: always
+    on_error: always    # default: always
diff --git a/kitchen.yml b/kitchen.yml
index 187a99b..1390c5d 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -8,28 +8,67 @@ 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
+  - name: centos-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:centos-8
+  - name: centos-7-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:centos-7
+  - name: amazonlinux-2-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:amazonlinux-2
+  - name: oraclelinux-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:oraclelinux-8
+  - name: oraclelinux-7-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:oraclelinux-7
+
   ## 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
   - name: centos-8-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-8
+  - name: centos-7-master-py3
+    driver:
+      image: saltimages/salt-master-py3:centos-7
+  - name: fedora-33-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-33
   - name: fedora-32-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-32
-  - name: fedora-31-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-31
   - name: opensuse-leap-152-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.2
@@ -38,86 +77,213 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+  - name: opensuse-tmbl-latest-master-py3
+    driver:
+      image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
   - name: amazonlinux-2-master-py3
     driver:
       image: saltimages/salt-master-py3:amazonlinux-2
+  - name: oraclelinux-8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:oraclelinux-8
+  - name: oraclelinux-7-master-py3
+    driver:
+      image: saltimages/salt-master-py3:oraclelinux-7
+  - name: gentoo-stage3-latest-master-py3
+    driver:
+      image: saltimages/salt-master-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-master-py3
+    driver:
+      image: saltimages/salt-master-py3:gentoo-stage3-systemd
 
-  ## SALT `3000.3`
-  - name: debian-10-3000-3-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-3000.3-py3:debian-10
-  - name: debian-9-3000-3-py3
+      image: saltimages/salt-3002.2-py3:debian-9
+  - name: ubuntu-2004-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-9
-  - name: ubuntu-1804-3000-3-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:ubuntu-18.04
-  - name: centos-8-3000-3-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-18.04
+  - name: ubuntu-1604-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:centos-8
-  - name: centos-7-3000-3-py3
+      image: saltimages/salt-3002.2-py3:ubuntu-16.04
+  - name: centos-8-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:centos-7
-  - name: fedora-31-3000-3-py3
+      image: saltimages/salt-3002.2-py3:centos-8
+  - name: centos-7-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:fedora-31
-  - name: opensuse-leap-152-3000-3-py3
+      image: saltimages/salt-3002.2-py3:centos-7
+  - name: fedora-33-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:opensuse-leap-15.2
+      image: saltimages/salt-3002.2-py3:fedora-33
+  - name: fedora-32-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:fedora-32
+  - name: opensuse-leap-152-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
       run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-3000-3-py3
+  - name: opensuse-tmbl-latest-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py3:amazonlinux-2
-  - name: ubuntu-1804-3000-3-py2
+      image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-18.04
-  - name: arch-base-latest-3000-3-py2
+      image: saltimages/salt-3002.2-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-2-py3
     driver:
-      image: saltimages/salt-3000.3-py2:arch-base-latest
+      image: saltimages/salt-3002.2-py3:oraclelinux-7
+  - name: arch-base-latest-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:arch-base-latest
       run_command: /usr/lib/systemd/systemd
+  - name: gentoo-stage3-latest-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:gentoo-stage3-systemd
 
-  ## SALT `2019.2`
-  - name: debian-10-2019-2-py3
+  ## 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-2019.2-py3:debian-10
-  - name: ubuntu-1804-2019-2-py3
+      image: saltimages/salt-3001.4-py3:ubuntu-18.04
+  - name: ubuntu-1604-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:ubuntu-18.04
-  - name: centos-8-2019-2-py3
+      image: saltimages/salt-3001.4-py3:ubuntu-16.04
+  - name: centos-8-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:centos-8
-  - name: centos-7-2019-2-py3
+      image: saltimages/salt-3001.4-py3:centos-8
+  - name: centos-7-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:centos-7
-  - name: fedora-31-2019-2-py3
+      image: saltimages/salt-3001.4-py3:centos-7
+  - name: fedora-33-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:fedora-31
-  - name: opensuse-leap-152-2019-2-py3
+      image: saltimages/salt-3001.4-py3:fedora-33
+  - name: fedora-32-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:opensuse-leap-15.2
+      image: saltimages/salt-3001.4-py3:fedora-32
+  - name: opensuse-leap-152-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:opensuse-leap-15.2
       run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-2019-2-py3
+  - name: opensuse-tmbl-latest-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:opensuse-tumbleweed-latest
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:amazonlinux-2
+  - name: oraclelinux-8-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py3:amazonlinux-2
-  - name: centos-6-2019-2-py2
+      image: saltimages/salt-3001.4-py3:oraclelinux-8
+  - name: oraclelinux-7-3001-4-py3
     driver:
-      image: saltimages/salt-2019.2-py2:centos-6
+      image: saltimages/salt-3001.4-py3:oraclelinux-7
+  - name: arch-base-latest-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+  - name: gentoo-stage3-latest-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: amazonlinux-1-2019-2-py2
+  - name: gentoo-stage3-systemd-3001-4-py3
+    driver:
+      image: saltimages/salt-3001.4-py3:gentoo-stage3-systemd
+
+  ## 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-2019.2-py2:amazonlinux-1
+      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: centos-8-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:centos-8
+  - name: centos-7-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:centos-7
+  - name: opensuse-leap-152-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:opensuse-leap-15.2
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:amazonlinux-2
+  - name: oraclelinux-8-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:oraclelinux-8
+  - name: oraclelinux-7-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:oraclelinux-7
+  - name: gentoo-stage3-latest-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: arch-base-latest-2019-2-py2
+  - name: gentoo-stage3-systemd-3000-6-py3
+    driver:
+      image: saltimages/salt-3000.6-py3:gentoo-stage3-systemd
+  - name: ubuntu-1804-3000-6-py2
+    driver:
+      image: saltimages/salt-3000.6-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-6-py2
+    driver:
+      image: saltimages/salt-3000.6-py2:ubuntu-16.04
+  - name: arch-base-latest-3000-6-py2
     driver:
-      image: saltimages/salt-2019.2-py2:arch-base-latest
+      image: saltimages/salt-3000.6-py2:arch-base-latest
       run_command: /usr/lib/systemd/systemd
 
 provisioner:
diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml
index 1f1be7c..c1343d1 100644
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@@ -15,4 +15,7 @@ supports:
   - platform-name: suse
   - platform-name: freebsd
   - platform-name: amazon
+  - platform-name: oracle
   - platform-name: arch
+  - platform-name: gentoo
+  - platform: windows