diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
deleted file mode 100644
index 0ecd6500..00000000
--- a/.github/workflows/kitchen.vagrant.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
----
-name: 'Kitchen Vagrant (FreeBSD)'
-'on': ['push', 'pull_request']
-
-env:
-  KITCHEN_LOCAL_YAML: 'kitchen.vagrant.yml'
-
-jobs:
-  test:
-    runs-on: 'macos-10.15'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          # - default-freebsd-130-master-py3
-          # - modules-freebsd-130-master-py3
-          - freebsd-130-master-py3
-          # - default-freebsd-122-master-py3
-          # - modules-freebsd-122-master-py3
-          - freebsd-122-master-py3
-          # - default-freebsd-114-master-py3
-          # - modules-freebsd-114-master-py3
-          - freebsd-114-master-py3
-          # - default-freebsd-130-3002-6-py3
-          # - default-freebsd-122-3002-6-py3
-          # - default-freebsd-114-3002-6-py3
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen verify ${{ matrix.instance }}'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4739871b..d20a4453 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,60 +45,6 @@ stages:
 variables:
   DOCKER_DRIVER: 'overlay2'
 
-###############################################################################
-# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
-###############################################################################
-commitlint:
-  stage: *stage_lint
-  image: *image_commitlint
-  script:
-    # Add `upstream` remote to get access to `upstream/master`
-    - 'git remote add upstream
-       https://gitlab.com/saltstack-formulas/apache-formula.git'
-    - 'git fetch --all'
-    # Set default commit hashes for `--from` and `--to`
-    - 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"'
-    - 'export COMMITLINT_TO="${CI_COMMIT_SHA}"'
-    # `coqbot` adds a merge commit to test PRs on top of the latest commit in
-    # the repo; amend this merge commit message to avoid failure
-    - |
-      if [ "${GITLAB_USER_LOGIN}" = "coqbot" ] \
-      && [ "${CI_COMMIT_BRANCH}" != "master" ]; then
-        git commit --amend -m \
-          'chore: reword coqbot merge commit message for commitlint'
-        export COMMITLINT_TO=HEAD
-      fi
-    # Run `commitlint`
-    - 'commitlint --from "${COMMITLINT_FROM}"
-                  --to   "${COMMITLINT_TO}"
-                  --verbose'
-
-pre-commit:
-  stage: *stage_lint
-  image: *image_precommit
-  # https://pre-commit.com/#gitlab-ci-example
-  variables:
-    PRE_COMMIT_HOME: '${CI_PROJECT_DIR}/.cache/pre-commit'
-  cache:
-    key: '${CI_JOB_NAME}'
-    paths:
-      - '${PRE_COMMIT_HOME}'
-  script:
-    - 'pre-commit run --all-files --color always --verbose'
-
-# Use a separate job for `rubocop` other than the one potentially run by `pre-commit`
-# - The `pre-commit` check will only be available for formulas that pass the default
-#   `rubocop` check -- and must continue to do so
-# - This job is allowed to fail, so can be used for all formulas
-# - Furthermore, this job uses all of the latest `rubocop` features & cops,
-#   which will help when upgrading the `rubocop` linter used in `pre-commit`
-rubocop:
-  allow_failure: true
-  stage: *stage_lint
-  image: *image_rubocop
-  script:
-    - 'rubocop -d -P -S --enable-pending-cops'
-
 ###############################################################################
 # Define `test` template
 ###############################################################################
@@ -154,6 +100,9 @@ centos-8-master-py3: {extends: '.test_instance'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # modules-centos-7-master-py3: {extends: '.test_instance'}
 centos-7-master-py3: {extends: '.test_instance'}
+# default-fedora-34-master-py3: {extends: '.test_instance'}
+# modules-fedora-34-master-py3: {extends: '.test_instance'}
+fedora-34-master-py3: {extends: '.test_instance'}
 # default-fedora-33-master-py3: {extends: '.test_instance'}
 # modules-fedora-33-master-py3: {extends: '.test_instance'}
 fedora-33-master-py3: {extends: '.test_instance'}
@@ -182,57 +131,74 @@ oraclelinux-7-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # modules-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-# default-debian-10-3002-5-py3: {extends: '.test_instance'}
-# default-debian-9-3002-5-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
-# default-centos-8-3002-5-py3: {extends: '.test_instance'}
-# default-centos-7-3002-5-py3: {extends: '.test_instance'}
-# default-fedora-33-3002-5-py3: {extends: '.test_instance'}
-# default-fedora-32-3002-5-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
-modules-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
-# arch-base-latest-3002-5-py3: {extends: '.test_instance'}
+# default-debian-10-3003-0-py3: {extends: '.test_instance'}
+# default-debian-9-3003-0-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
+# default-centos-8-3003-0-py3: {extends: '.test_instance'}
+# default-centos-7-3003-0-py3: {extends: '.test_instance'}
+# default-fedora-34-3003-0-py3: {extends: '.test_instance'}
+# default-fedora-33-3003-0-py3: {extends: '.test_instance'}
+# default-fedora-32-3003-0-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
+modules-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
+# arch-base-latest-3003-0-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
+# default-debian-10-3002-6-py3: {extends: '.test_instance'}
+# default-debian-9-3002-6-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'}
+# default-centos-8-3002-6-py3: {extends: '.test_instance'}
+# default-centos-7-3002-6-py3: {extends: '.test_instance'}
+# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
+# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
+# default-fedora-32-3002-6-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3002-5-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-debian-10-3001-6-py3: {extends: '.test_instance'}
-# default-debian-9-3001-6-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
-# default-centos-8-3001-6-py3: {extends: '.test_instance'}
-# default-centos-7-3001-6-py3: {extends: '.test_instance'}
-# default-fedora-33-3001-6-py3: {extends: '.test_instance'}
-# default-fedora-32-3001-6-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3001-6-py3: {extends: '.test_instance'}
+# default-debian-10-3001-7-py3: {extends: '.test_instance'}
+# default-debian-9-3001-7-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'}
+# default-centos-8-3001-7-py3: {extends: '.test_instance'}
+# default-centos-7-3001-7-py3: {extends: '.test_instance'}
+# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
+# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
+# default-fedora-32-3001-7-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
-# default-debian-10-3000-8-py3: {extends: '.test_instance'}
-# default-debian-9-3000-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
-# default-centos-8-3000-8-py3: {extends: '.test_instance'}
-# default-centos-7-3000-8-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
+# default-debian-10-3000-9-py3: {extends: '.test_instance'}
+# default-debian-9-3000-9-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'}
+# default-centos-8-3000-9-py3: {extends: '.test_instance'}
+# default-centos-7-3000-9-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
+# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'}
+# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
-# default-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}
-# default-arch-base-latest-3000-8-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`
diff --git a/kitchen.yml b/kitchen.yml
index e19d6588..58b43d34 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -63,6 +63,9 @@ platforms:
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
+  - name: fedora-34-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-34
   - name: fedora-33-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-33
@@ -102,47 +105,101 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:gentoo-stage3-systemd
 
-  ## SALT `3002.5`
-  - name: debian-10-3002-5-py3
+  ## SALT `3003.0`
+  - name: debian-10-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:debian-10
+  - name: debian-9-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:debian-9
+  - name: ubuntu-2004-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:ubuntu-20.04
+  - name: ubuntu-1804-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:ubuntu-18.04
+  - name: centos-8-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:centos-8
+  - name: centos-7-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:centos-7
+  - name: fedora-34-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:fedora-34
+  - name: fedora-33-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:fedora-33
+  - name: fedora-32-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:fedora-32
+  - name: amazonlinux-2-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:oraclelinux-8
+  - name: oraclelinux-7-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:oraclelinux-7
+  - name: arch-base-latest-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+  - name: gentoo-stage3-latest-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3003-0-py3
+    driver:
+      image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd
+
+  ## SALT `3002.6`
+  - name: debian-10-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:debian-10
+  - name: debian-9-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:debian-10
-  - name: debian-9-3002-5-py3
+      image: saltimages/salt-3002.6-py3:debian-9
+  - name: ubuntu-2004-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:debian-9
-  - name: ubuntu-2004-3002-5-py3
+      image: saltimages/salt-3002.6-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-20.04
-  - name: ubuntu-1804-3002-5-py3
+      image: saltimages/salt-3002.6-py3:ubuntu-18.04
+  - name: ubuntu-1604-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-18.04
-  - name: ubuntu-1604-3002-5-py3
+      image: saltimages/salt-3002.6-py3:ubuntu-16.04
+  - name: centos-8-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-16.04
-  - name: centos-8-3002-5-py3
+      image: saltimages/salt-3002.6-py3:centos-8
+  - name: centos-7-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:centos-8
-  - name: centos-7-3002-5-py3
+      image: saltimages/salt-3002.6-py3:centos-7
+  - name: fedora-34-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:centos-7
-  - name: fedora-33-3002-5-py3
+      image: saltimages/salt-3002.6-py3:fedora-34
+  - name: fedora-33-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:fedora-33
-  - name: fedora-32-3002-5-py3
+      image: saltimages/salt-3002.6-py3:fedora-33
+  - name: fedora-32-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:fedora-32
-  - name: amazonlinux-2-3002-5-py3
+      image: saltimages/salt-3002.6-py3:fedora-32
+  - name: amazonlinux-2-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-5-py3
+      image: saltimages/salt-3002.6-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-5-py3
+      image: saltimages/salt-3002.6-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:oraclelinux-7
-  - name: arch-base-latest-3002-5-py3
+      image: saltimages/salt-3002.6-py3:oraclelinux-7
+  - name: arch-base-latest-3002-6-py3
     driver:
-      image: saltimages/salt-3002.5-py3:arch-base-latest
+      image: saltimages/salt-3002.6-py3:arch-base-latest
       run_command: /usr/lib/systemd/systemd
+
+  ## SALT `3002.5`
   - name: gentoo-stage3-latest-3002-5-py3
     driver:
       image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
@@ -169,63 +226,68 @@ platforms:
     transport:
       max_ssh_sessions: 1
 
-  ## SALT `3001.6`
-  - name: debian-10-3001-6-py3
+  ## SALT `3001.7`
+  - name: debian-10-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:debian-10
-  - name: debian-9-3001-6-py3
+      image: saltimages/salt-3001.7-py3:debian-10
+  - name: debian-9-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:debian-9
-  - name: ubuntu-2004-3001-6-py3
+      image: saltimages/salt-3001.7-py3:debian-9
+  - name: ubuntu-2004-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-6-py3
+      image: saltimages/salt-3001.7-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-18.04
-  - name: ubuntu-1604-3001-6-py3
+      image: saltimages/salt-3001.7-py3:ubuntu-18.04
+  - name: ubuntu-1604-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-16.04
-  - name: centos-8-3001-6-py3
+      image: saltimages/salt-3001.7-py3:ubuntu-16.04
+  - name: centos-8-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:centos-8
-  - name: centos-7-3001-6-py3
+      image: saltimages/salt-3001.7-py3:centos-8
+  - name: centos-7-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:centos-7
-  - name: fedora-33-3001-6-py3
+      image: saltimages/salt-3001.7-py3:centos-7
+  - name: fedora-34-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:fedora-33
-  - name: fedora-32-3001-6-py3
+      image: saltimages/salt-3001.7-py3:fedora-34
+  - name: fedora-33-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:fedora-32
-  - name: opensuse-leap-152-3001-6-py3
+      image: saltimages/salt-3001.7-py3:fedora-33
+  - name: fedora-32-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:opensuse-leap-15.2
+      image: saltimages/salt-3001.7-py3:fedora-32
+  - name: opensuse-leap-152-3001-7-py3
+    driver:
+      image: saltimages/salt-3001.7-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: opensuse-tmbl-latest-3001-6-py3
+  - name: opensuse-tmbl-latest-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3001.7-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-6-py3
+  - name: amazonlinux-2-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-6-py3
+      image: saltimages/salt-3001.7-py3:amazonlinux-2
+  - name: oraclelinux-8-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-6-py3
+      image: saltimages/salt-3001.7-py3:oraclelinux-8
+  - name: oraclelinux-7-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:oraclelinux-7
-  - name: arch-base-latest-3001-6-py3
+      image: saltimages/salt-3001.7-py3:oraclelinux-7
+  - name: arch-base-latest-3001-7-py3
     driver:
-      image: saltimages/salt-3001.6-py3:arch-base-latest
+      image: saltimages/salt-3001.7-py3:arch-base-latest
       run_command: /usr/lib/systemd/systemd
+
+  ## SALT `3001.6`
   - name: gentoo-stage3-latest-3001-6-py3
     driver:
       image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
@@ -234,42 +296,54 @@ platforms:
     driver:
       image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd
 
-  ## SALT `3000.8`
-  - name: debian-10-3000-8-py3
+  ## SALT `3000.9`
+  - name: debian-10-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:debian-10
-  - name: debian-9-3000-8-py3
+      image: saltimages/salt-3000.9-py3:debian-10
+  - name: debian-9-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:debian-9
-  - name: ubuntu-1804-3000-8-py3
+      image: saltimages/salt-3000.9-py3:debian-9
+  - name: ubuntu-1804-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:ubuntu-18.04
-  - name: ubuntu-1604-3000-8-py3
+      image: saltimages/salt-3000.9-py3:ubuntu-18.04
+  - name: ubuntu-1604-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:ubuntu-16.04
-  - name: centos-8-3000-8-py3
+      image: saltimages/salt-3000.9-py3:ubuntu-16.04
+  - name: centos-8-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:centos-8
-  - name: centos-7-3000-8-py3
+      image: saltimages/salt-3000.9-py3:centos-8
+  - name: centos-7-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:centos-7
-  - name: opensuse-leap-152-3000-8-py3
+      image: saltimages/salt-3000.9-py3:centos-7
+  - name: opensuse-leap-152-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:opensuse-leap-15.2
+      image: saltimages/salt-3000.9-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-8-py3
+  - name: amazonlinux-2-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:amazonlinux-2
+  - name: oraclelinux-8-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:amazonlinux-2
-  - name: oraclelinux-8-3000-8-py3
+      image: saltimages/salt-3000.9-py3:oraclelinux-8
+  - name: oraclelinux-7-3000-9-py3
     driver:
-      image: saltimages/salt-3000.8-py3:oraclelinux-8
-  - name: oraclelinux-7-3000-8-py3
+      image: saltimages/salt-3000.9-py3:oraclelinux-7
+  - name: ubuntu-1804-3000-9-py2
     driver:
-      image: saltimages/salt-3000.8-py3:oraclelinux-7
+      image: saltimages/salt-3000.9-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-9-py2
+    driver:
+      image: saltimages/salt-3000.9-py2:ubuntu-16.04
+  - name: arch-base-latest-3000-9-py2
+    driver:
+      image: saltimages/salt-3000.9-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+
+  ## SALT `3000.8`
   - name: gentoo-stage3-latest-3000-8-py3
     driver:
       image: saltimages/salt-3000.8-py3:gentoo-stage3-latest
@@ -277,16 +351,6 @@ platforms:
   - name: gentoo-stage3-systemd-3000-8-py3
     driver:
       image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd
-  - name: ubuntu-1804-3000-8-py2
-    driver:
-      image: saltimages/salt-3000.8-py2:ubuntu-18.04
-  - name: ubuntu-1604-3000-8-py2
-    driver:
-      image: saltimages/salt-3000.8-py2:ubuntu-16.04
-  - name: arch-base-latest-3000-8-py2
-    driver:
-      image: saltimages/salt-3000.8-py2:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
 
 provisioner:
   name: salt_solo