diff --git a/.gitignore b/.gitignore
index 94f77a8..39752a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,6 +127,7 @@ tmp/
 # `salt-formula` -- Vagrant Specific files
 .vagrant
 top.sls
+!test/salt/pillar/top.sls
 
 # `suricata-formula` -- Platform binaries
 *.rpm
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62d58da..c3dd4d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,77 +174,60 @@ git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 rpm-almalinux-8-master-py3: {extends: '.test_instance'}
 # git-rockylinux-8-master-py3: {extends: '.test_instance'}
 rpm-rockylinux-8-master-py3: {extends: '.test_instance'}
-# git-debian-11-3003-2-py3: {extends: '.test_instance'}
-# git-debian-10-3003-2-py3: {extends: '.test_instance'}
-# git-debian-9-3003-2-py3: {extends: '.test_instance'}
-# git-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
-# git-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
-# git-centos-8-3003-2-py3: {extends: '.test_instance'}
-# git-centos-7-3003-2-py3: {extends: '.test_instance'}
-# git-fedora-34-3003-2-py3: {extends: '.test_instance'}
-# git-fedora-33-3003-2-py3: {extends: '.test_instance'}
-# git-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
-# git-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
-# git-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
-# git-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
-# git-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
-# git-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
-# git-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
-# git-almalinux-8-3003-2-py3: {extends: '.test_instance'}
-# git-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
-# git-debian-11-3002-6-py3: {extends: '.test_instance'}
-# git-debian-10-3002-6-py3: {extends: '.test_instance'}
-# git-debian-9-3002-6-py3: {extends: '.test_instance'}
-# git-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
-# git-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
-# git-centos-8-3002-6-py3: {extends: '.test_instance'}
-# git-centos-7-3002-6-py3: {extends: '.test_instance'}
-# git-fedora-34-3002-6-py3: {extends: '.test_instance'}
-# git-fedora-33-3002-6-py3: {extends: '.test_instance'}
-# git-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
-# git-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
-# git-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
-# git-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
-# git-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
-# git-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
-# git-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
-# git-debian-10-3001-7-py3: {extends: '.test_instance'}
-# git-debian-9-3001-7-py3: {extends: '.test_instance'}
-# git-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
-# git-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
-# git-centos-8-3001-7-py3: {extends: '.test_instance'}
-# git-centos-7-3001-7-py3: {extends: '.test_instance'}
-# git-fedora-34-3001-7-py3: {extends: '.test_instance'}
-# git-fedora-33-3001-7-py3: {extends: '.test_instance'}
-# git-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
-# git-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
-# git-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
-# git-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
-# git-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
-# git-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
-# git-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
-# git-debian-10-3000-9-py3: {extends: '.test_instance'}
-# git-debian-9-3000-9-py3: {extends: '.test_instance'}
-# git-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
-# git-centos-8-3000-9-py3: {extends: '.test_instance'}
-# git-centos-7-3000-9-py3: {extends: '.test_instance'}
-# git-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
-# git-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
-# git-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
-# git-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
-# git-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
-# git-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
-# git-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
+# git-debian-11-3003-3-py3: {extends: '.test_instance'}
+# git-debian-10-3003-3-py3: {extends: '.test_instance'}
+# git-debian-9-3003-3-py3: {extends: '.test_instance'}
+# git-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
+# git-centos-8-3003-3-py3: {extends: '.test_instance'}
+# git-centos-7-3003-3-py3: {extends: '.test_instance'}
+# git-fedora-34-3003-3-py3: {extends: '.test_instance'}
+# git-fedora-33-3003-3-py3: {extends: '.test_instance'}
+# git-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
+# git-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
+# git-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
+# git-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
+# git-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
+# git-almalinux-8-3003-3-py3: {extends: '.test_instance'}
+# git-debian-11-3002-7-py3: {extends: '.test_instance'}
+# git-debian-10-3002-7-py3: {extends: '.test_instance'}
+# git-debian-9-3002-7-py3: {extends: '.test_instance'}
+# git-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
+# git-centos-8-3002-7-py3: {extends: '.test_instance'}
+# git-centos-7-3002-7-py3: {extends: '.test_instance'}
+# git-fedora-34-3002-7-py3: {extends: '.test_instance'}
+# git-fedora-33-3002-7-py3: {extends: '.test_instance'}
+# git-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
+# git-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
+# git-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
+# git-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
+# git-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
+# git-debian-10-3001-8-py3: {extends: '.test_instance'}
+# git-debian-9-3001-8-py3: {extends: '.test_instance'}
+# git-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
+# git-centos-8-3001-8-py3: {extends: '.test_instance'}
+# git-centos-7-3001-8-py3: {extends: '.test_instance'}
+# git-fedora-34-3001-8-py3: {extends: '.test_instance'}
+# git-fedora-33-3001-8-py3: {extends: '.test_instance'}
+# git-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
+# git-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
+# git-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
+# git-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
+# git-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`
diff --git a/.travis.yml b/.travis.yml
index 2ccaba1..4983718 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -134,77 +134,60 @@ jobs:
     - env: INSTANCE=rpm-almalinux-8-master-py3
     # - env: INSTANCE=git-rockylinux-8-master-py3
     - env: INSTANCE=rpm-rockylinux-8-master-py3
-    # - env: INSTANCE=git-debian-11-3003-2-py3
-    # - env: INSTANCE=git-debian-10-3003-2-py3
-    # - env: INSTANCE=git-debian-9-3003-2-py3
-    # - env: INSTANCE=git-ubuntu-2004-3003-2-py3
-    # - env: INSTANCE=git-ubuntu-1804-3003-2-py3
-    # - env: INSTANCE=git-centos-8-3003-2-py3
-    # - env: INSTANCE=git-centos-7-3003-2-py3
-    # - env: INSTANCE=git-fedora-34-3003-2-py3
-    # - env: INSTANCE=git-fedora-33-3003-2-py3
-    # - env: INSTANCE=git-opensuse-leap-153-3003-2-py3
-    # - env: INSTANCE=git-opensuse-leap-152-3003-2-py3
-    # - env: INSTANCE=git-opensuse-tmbl-latest-3003-2-py3
-    # - env: INSTANCE=git-amazonlinux-2-3003-2-py3
-    # - env: INSTANCE=git-oraclelinux-8-3003-2-py3
-    # - env: INSTANCE=git-oraclelinux-7-3003-2-py3
-    # - env: INSTANCE=git-arch-base-latest-3003-2-py3
-    # - env: INSTANCE=git-gentoo-stage3-latest-3003-2-py3
-    # - env: INSTANCE=git-gentoo-stage3-systemd-3003-2-py3
-    # - env: INSTANCE=git-almalinux-8-3003-2-py3
-    # - env: INSTANCE=git-arch-base-latest-3003-1-py3
-    # - env: INSTANCE=git-gentoo-stage3-latest-3003-1-py3
-    # - env: INSTANCE=git-gentoo-stage3-systemd-3003-1-py3
-    # - env: INSTANCE=git-debian-11-3002-6-py3
-    # - env: INSTANCE=git-debian-10-3002-6-py3
-    # - env: INSTANCE=git-debian-9-3002-6-py3
-    # - env: INSTANCE=git-ubuntu-2004-3002-6-py3
-    # - env: INSTANCE=git-ubuntu-1804-3002-6-py3
-    # - env: INSTANCE=git-centos-8-3002-6-py3
-    # - env: INSTANCE=git-centos-7-3002-6-py3
-    # - env: INSTANCE=git-fedora-34-3002-6-py3
-    # - env: INSTANCE=git-fedora-33-3002-6-py3
-    # - env: INSTANCE=git-amazonlinux-2-3002-6-py3
-    # - env: INSTANCE=git-oraclelinux-8-3002-6-py3
-    # - env: INSTANCE=git-oraclelinux-7-3002-6-py3
-    # - env: INSTANCE=git-arch-base-latest-3002-6-py3
-    # - env: INSTANCE=git-gentoo-stage3-latest-3002-6-py3
-    # - env: INSTANCE=git-gentoo-stage3-systemd-3002-6-py3
-    # - env: INSTANCE=git-opensuse-leap-153-3002-2-py3
-    # - env: INSTANCE=git-opensuse-leap-152-3002-2-py3
-    # - env: INSTANCE=git-opensuse-tmbl-latest-3002-2-py3
-    # - env: INSTANCE=git-debian-10-3001-7-py3
-    # - env: INSTANCE=git-debian-9-3001-7-py3
-    # - env: INSTANCE=git-ubuntu-2004-3001-7-py3
-    # - env: INSTANCE=git-ubuntu-1804-3001-7-py3
-    # - env: INSTANCE=git-centos-8-3001-7-py3
-    # - env: INSTANCE=git-centos-7-3001-7-py3
-    # - env: INSTANCE=git-fedora-34-3001-7-py3
-    # - env: INSTANCE=git-fedora-33-3001-7-py3
-    # - env: INSTANCE=git-opensuse-leap-153-3001-7-py3
-    # - env: INSTANCE=git-opensuse-leap-152-3001-7-py3
-    # - env: INSTANCE=git-opensuse-tmbl-latest-3001-7-py3
-    # - env: INSTANCE=git-amazonlinux-2-3001-7-py3
-    # - env: INSTANCE=git-oraclelinux-8-3001-7-py3
-    # - env: INSTANCE=git-oraclelinux-7-3001-7-py3
-    # - env: INSTANCE=git-arch-base-latest-3001-7-py3
-    # - env: INSTANCE=git-gentoo-stage3-latest-3001-7-py3
-    # - env: INSTANCE=git-gentoo-stage3-systemd-3001-7-py3
-    # - env: INSTANCE=git-debian-10-3000-9-py3
-    # - env: INSTANCE=git-debian-9-3000-9-py3
-    # - env: INSTANCE=git-ubuntu-1804-3000-9-py3
-    # - env: INSTANCE=git-centos-8-3000-9-py3
-    # - env: INSTANCE=git-centos-7-3000-9-py3
-    # - env: INSTANCE=git-opensuse-leap-153-3000-9-py3
-    # - env: INSTANCE=git-opensuse-leap-152-3000-9-py3
-    # - env: INSTANCE=git-amazonlinux-2-3000-9-py3
-    # - env: INSTANCE=git-oraclelinux-8-3000-9-py3
-    # - env: INSTANCE=git-oraclelinux-7-3000-9-py3
-    # - env: INSTANCE=git-gentoo-stage3-latest-3000-9-py3
-    # - env: INSTANCE=git-gentoo-stage3-systemd-3000-9-py3
-    # - env: INSTANCE=git-ubuntu-1804-3000-9-py2
-    # - env: INSTANCE=git-arch-base-latest-3000-9-py2
+    # - env: INSTANCE=git-debian-11-3003-3-py3
+    # - env: INSTANCE=git-debian-10-3003-3-py3
+    # - env: INSTANCE=git-debian-9-3003-3-py3
+    # - env: INSTANCE=git-ubuntu-2004-3003-3-py3
+    # - env: INSTANCE=git-ubuntu-1804-3003-3-py3
+    # - env: INSTANCE=git-centos-8-3003-3-py3
+    # - env: INSTANCE=git-centos-7-3003-3-py3
+    # - env: INSTANCE=git-fedora-34-3003-3-py3
+    # - env: INSTANCE=git-fedora-33-3003-3-py3
+    # - env: INSTANCE=git-opensuse-leap-153-3003-3-py3
+    # - env: INSTANCE=git-opensuse-leap-152-3003-3-py3
+    # - env: INSTANCE=git-opensuse-tmbl-latest-3003-3-py3
+    # - env: INSTANCE=git-amazonlinux-2-3003-3-py3
+    # - env: INSTANCE=git-oraclelinux-8-3003-3-py3
+    # - env: INSTANCE=git-oraclelinux-7-3003-3-py3
+    # - env: INSTANCE=git-arch-base-latest-3003-3-py3
+    # - env: INSTANCE=git-gentoo-stage3-latest-3003-3-py3
+    # - env: INSTANCE=git-gentoo-stage3-systemd-3003-3-py3
+    # - env: INSTANCE=git-almalinux-8-3003-3-py3
+    # - env: INSTANCE=git-debian-11-3002-7-py3
+    # - env: INSTANCE=git-debian-10-3002-7-py3
+    # - env: INSTANCE=git-debian-9-3002-7-py3
+    # - env: INSTANCE=git-ubuntu-2004-3002-7-py3
+    # - env: INSTANCE=git-ubuntu-1804-3002-7-py3
+    # - env: INSTANCE=git-centos-8-3002-7-py3
+    # - env: INSTANCE=git-centos-7-3002-7-py3
+    # - env: INSTANCE=git-fedora-34-3002-7-py3
+    # - env: INSTANCE=git-fedora-33-3002-7-py3
+    # - env: INSTANCE=git-opensuse-leap-153-3002-7-py3
+    # - env: INSTANCE=git-opensuse-leap-152-3002-7-py3
+    # - env: INSTANCE=git-opensuse-tmbl-latest-3002-7-py3
+    # - env: INSTANCE=git-amazonlinux-2-3002-7-py3
+    # - env: INSTANCE=git-oraclelinux-8-3002-7-py3
+    # - env: INSTANCE=git-oraclelinux-7-3002-7-py3
+    # - env: INSTANCE=git-arch-base-latest-3002-7-py3
+    # - env: INSTANCE=git-gentoo-stage3-latest-3002-7-py3
+    # - env: INSTANCE=git-gentoo-stage3-systemd-3002-7-py3
+    # - env: INSTANCE=git-debian-10-3001-8-py3
+    # - env: INSTANCE=git-debian-9-3001-8-py3
+    # - env: INSTANCE=git-ubuntu-2004-3001-8-py3
+    # - env: INSTANCE=git-ubuntu-1804-3001-8-py3
+    # - env: INSTANCE=git-centos-8-3001-8-py3
+    # - env: INSTANCE=git-centos-7-3001-8-py3
+    # - env: INSTANCE=git-fedora-34-3001-8-py3
+    # - env: INSTANCE=git-fedora-33-3001-8-py3
+    # - env: INSTANCE=git-opensuse-leap-153-3001-8-py3
+    # - env: INSTANCE=git-opensuse-leap-152-3001-8-py3
+    # - env: INSTANCE=git-opensuse-tmbl-latest-3001-8-py3
+    # - env: INSTANCE=git-amazonlinux-2-3001-8-py3
+    # - env: INSTANCE=git-oraclelinux-8-3001-8-py3
+    # - env: INSTANCE=git-oraclelinux-7-3001-8-py3
+    # - env: INSTANCE=git-arch-base-latest-3001-8-py3
+    # - env: INSTANCE=git-gentoo-stage3-latest-3001-8-py3
+    # - env: INSTANCE=git-gentoo-stage3-systemd-3001-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index b173de9..5756e1a 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -142,297 +142,226 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:rockylinux-8
 
-  ## SALT `3003.2`
-  - name: debian-11-3003-2-py3
+  ## SALT `3003.3`
+  - name: debian-11-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:debian-11
+      image: saltimages/salt-3003.3-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: debian-10-3003-2-py3
+  - name: debian-10-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:debian-10
+      image: saltimages/salt-3003.3-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3003-2-py3
+  - name: debian-9-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:debian-9
+      image: saltimages/salt-3003.3-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3003-2-py3
+  - name: ubuntu-2004-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:ubuntu-20.04
+      image: saltimages/salt-3003.3-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-2-py3
+  - name: ubuntu-1804-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:ubuntu-18.04
+      image: saltimages/salt-3003.3-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-8-3003-2-py3
+  - name: centos-8-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:centos-8
-  - name: centos-7-3003-2-py3
+      image: saltimages/salt-3003.3-py3:centos-8
+  - name: centos-7-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:centos-7
-  - name: fedora-34-3003-2-py3
+      image: saltimages/salt-3003.3-py3:centos-7
+  - name: fedora-34-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:fedora-34
-  - name: fedora-33-3003-2-py3
+      image: saltimages/salt-3003.3-py3:fedora-34
+  - name: fedora-33-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:fedora-33
-  - name: opensuse-leap-153-3003-2-py3
+      image: saltimages/salt-3003.3-py3:fedora-33
+  - name: opensuse-leap-153-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:opensuse-leap-15.3
+      image: saltimages/salt-3003.3-py3:opensuse-leap-15.3
     # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-leap-152-3003-2-py3
+  - name: opensuse-leap-152-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:opensuse-leap-15.2
+      image: saltimages/salt-3003.3-py3:opensuse-leap-15.2
     # 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-3003-2-py3
+  - name: opensuse-tmbl-latest-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest
     # 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-3003-2-py3
+  - name: amazonlinux-2-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-2-py3
+      image: saltimages/salt-3003.3-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-2-py3
+      image: saltimages/salt-3003.3-py3:oraclelinux-8
+  - name: oraclelinux-7-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:oraclelinux-7
-  - name: arch-base-latest-3003-2-py3
+      image: saltimages/salt-3003.3-py3:oraclelinux-7
+  - name: arch-base-latest-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3003-2-py3
+      image: saltimages/salt-3003.3-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
+      image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3003-2-py3
+  - name: gentoo-stage3-systemd-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
-  - name: almalinux-8-3003-2-py3
+      image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd
+  - name: almalinux-8-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:almalinux-8
+      image: saltimages/salt-3003.3-py3:almalinux-8
 
-  ## SALT `3003.1`
-  - name: arch-base-latest-3003-1-py3
+  ## SALT `3002.7`
+  - name: debian-11-3002-7-py3
     driver:
-      image: saltimages/salt-3003.1-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3003-1-py3
-    driver:
-      image: saltimages/salt-3003.1-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3003-1-py3
-    driver:
-      image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd
-
-  ## SALT `3002.6`
-  - name: debian-11-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:debian-11
+      image: saltimages/salt-3002.7-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: debian-10-3002-6-py3
+  - name: debian-10-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:debian-10
+      image: saltimages/salt-3002.7-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3002-6-py3
+  - name: debian-9-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:debian-9
+      image: saltimages/salt-3002.7-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3002-6-py3
+  - name: ubuntu-2004-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-20.04
+      image: saltimages/salt-3002.7-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3002-6-py3
+  - name: ubuntu-1804-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-18.04
+      image: saltimages/salt-3002.7-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-8-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:centos-8
-  - name: centos-7-3002-6-py3
+  - name: centos-8-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:centos-7
-  - name: fedora-34-3002-6-py3
+      image: saltimages/salt-3002.7-py3:centos-8
+  - name: centos-7-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:fedora-34
-  - name: fedora-33-3002-6-py3
+      image: saltimages/salt-3002.7-py3:centos-7
+  - name: fedora-34-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:fedora-33
-  - name: amazonlinux-2-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:oraclelinux-7
-  - name: arch-base-latest-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3002-6-py3
-    driver:
-      image: saltimages/salt-3002.6-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3002-6-py3
+      image: saltimages/salt-3002.7-py3:fedora-34
+  - name: fedora-33-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd
-
-  ## SALT `3002.2`
-  - name: opensuse-leap-153-3002-2-py3
+      image: saltimages/salt-3002.7-py3:fedora-33
+  - name: opensuse-leap-153-3002-7-py3
     driver:
-      image: saltimages/salt-3002.2-py3:opensuse-leap-15.3
+      image: saltimages/salt-3002.7-py3:opensuse-leap-15.3
     # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-leap-152-3002-2-py3
+  - name: opensuse-leap-152-3002-7-py3
     driver:
-      image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
+      image: saltimages/salt-3002.7-py3:opensuse-leap-15.2
     # 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-3002-2-py3
+  - name: opensuse-tmbl-latest-3002-7-py3
     driver:
-      image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest
     # 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-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:oraclelinux-7
+  - name: arch-base-latest-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
 
-  ## SALT `3001.7`
-  - name: debian-10-3001-7-py3
+  ## SALT `3001.8`
+  - name: debian-10-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:debian-10
+      image: saltimages/salt-3001.8-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3001-7-py3
+  - name: debian-9-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:debian-9
+      image: saltimages/salt-3001.8-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3001-7-py3
+  - name: ubuntu-2004-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-20.04
+      image: saltimages/salt-3001.8-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3001-7-py3
+  - name: ubuntu-1804-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-18.04
+      image: saltimages/salt-3001.8-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-8-3001-7-py3
+  - name: centos-8-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:centos-8
-  - name: centos-7-3001-7-py3
+      image: saltimages/salt-3001.8-py3:centos-8
+  - name: centos-7-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:centos-7
-  - name: fedora-34-3001-7-py3
+      image: saltimages/salt-3001.8-py3:centos-7
+  - name: fedora-34-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:fedora-34
-  - name: fedora-33-3001-7-py3
+      image: saltimages/salt-3001.8-py3:fedora-34
+  - name: fedora-33-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:fedora-33
-  - name: opensuse-leap-153-3001-7-py3
+      image: saltimages/salt-3001.8-py3:fedora-33
+  - name: opensuse-leap-153-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:opensuse-leap-15.3
+      image: saltimages/salt-3001.8-py3:opensuse-leap-15.3
     # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-leap-152-3001-7-py3
+  - name: opensuse-leap-152-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
+      image: saltimages/salt-3001.8-py3:opensuse-leap-15.2
     # 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-7-py3
+  - name: opensuse-tmbl-latest-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3001.8-py3:opensuse-tumbleweed-latest
     # 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-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:oraclelinux-7
-  - name: arch-base-latest-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd
-
-  ## SALT `3000.9`
-  - name: debian-10-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-8-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:centos-8
-  - name: centos-7-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:centos-7
-  - name: opensuse-leap-153-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-leap-152-3000-9-py3
+  - name: amazonlinux-2-3001-8-py3
     driver:
-      image: saltimages/salt-3000.9-py3:opensuse-leap-15.2
-    # 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-9-py3
+      image: saltimages/salt-3001.8-py3:amazonlinux-2
+  - name: oraclelinux-8-3001-8-py3
     driver:
-      image: saltimages/salt-3000.9-py3:amazonlinux-2
-  - name: oraclelinux-8-3000-9-py3
+      image: saltimages/salt-3001.8-py3:oraclelinux-8
+  - name: oraclelinux-7-3001-8-py3
     driver:
-      image: saltimages/salt-3000.9-py3:oraclelinux-8
-  - name: oraclelinux-7-3000-9-py3
+      image: saltimages/salt-3001.8-py3:oraclelinux-7
+  - name: arch-base-latest-3001-8-py3
     driver:
-      image: saltimages/salt-3000.9-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-3000-9-py3
+      image: saltimages/salt-3001.8-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3001-8-py3
     driver:
-      image: saltimages/salt-3000.9-py3:gentoo-stage3-latest
+      image: saltimages/salt-3001.8-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd
-  - name: ubuntu-1804-3000-9-py2
-    driver:
-      image: saltimages/salt-3000.9-py2:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: arch-base-latest-3000-9-py2
+  - name: gentoo-stage3-systemd-3001-8-py3
     driver:
-      image: saltimages/salt-3000.9-py2:arch-base-latest
+      image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd
 
 verifier:
   # https://www.inspec.io/
@@ -469,16 +398,14 @@ suites:
       - debian-11-master-py3
       - debian-10-master-py3
       - debian-9-master-py3
-      - debian-11-3003-2-py3
-      - debian-10-3003-2-py3
-      - debian-9-3003-2-py3
-      - debian-11-3002-6-py3
-      - debian-10-3002-6-py3
-      - debian-9-3002-6-py3
-      - debian-10-3001-7-py3
-      - debian-9-3001-7-py3
-      - debian-10-3000-9-py3
-      - debian-9-3000-9-py3
+      - debian-11-3003-3-py3
+      - debian-10-3003-3-py3
+      - debian-9-3003-3-py3
+      - debian-11-3002-7-py3
+      - debian-10-3002-7-py3
+      - debian-9-3002-7-py3
+      - debian-10-3001-8-py3
+      - debian-9-3001-8-py3
     provisioner:
       dependencies:
         - name: apt
@@ -523,33 +450,28 @@ suites:
       - oraclelinux-7-master-py3
       - almalinux-8-master-py3
       - rockylinux-8-master-py3
-      - centos-8-3003-2-py3
-      - centos-7-3003-2-py3
-      - fedora-34-3003-2-py3
-      - fedora-33-3003-2-py3
-      - amazonlinux-2-3003-2-py3
-      - oraclelinux-8-3003-2-py3
-      - oraclelinux-7-3003-2-py3
-      - almalinux-8-3003-2-py3
-      - centos-8-3002-6-py3
-      - centos-7-3002-6-py3
-      - fedora-34-3002-6-py3
-      - fedora-33-3002-6-py3
-      - amazonlinux-2-3002-6-py3
-      - oraclelinux-8-3002-6-py3
-      - oraclelinux-7-3002-6-py3
-      - centos-8-3001-7-py3
-      - centos-7-3001-7-py3
-      - fedora-34-3001-7-py3
-      - fedora-33-3001-7-py3
-      - amazonlinux-2-3001-7-py3
-      - oraclelinux-8-3001-7-py3
-      - oraclelinux-7-3001-7-py3
-      - centos-8-3000-9-py3
-      - centos-7-3000-9-py3
-      - amazonlinux-2-3000-9-py3
-      - oraclelinux-8-3000-9-py3
-      - oraclelinux-7-3000-9-py3
+      - centos-8-3003-3-py3
+      - centos-7-3003-3-py3
+      - fedora-34-3003-3-py3
+      - fedora-33-3003-3-py3
+      - amazonlinux-2-3003-3-py3
+      - oraclelinux-8-3003-3-py3
+      - oraclelinux-7-3003-3-py3
+      - almalinux-8-3003-3-py3
+      - centos-8-3002-7-py3
+      - centos-7-3002-7-py3
+      - fedora-34-3002-7-py3
+      - fedora-33-3002-7-py3
+      - amazonlinux-2-3002-7-py3
+      - oraclelinux-8-3002-7-py3
+      - oraclelinux-7-3002-7-py3
+      - centos-8-3001-8-py3
+      - centos-7-3001-8-py3
+      - fedora-34-3001-8-py3
+      - fedora-33-3001-8-py3
+      - amazonlinux-2-3001-8-py3
+      - oraclelinux-8-3001-8-py3
+      - oraclelinux-7-3001-8-py3
     provisioner:
       state_top:
         base:
@@ -579,24 +501,20 @@ suites:
       - debian-9-master-py3
       - ubuntu-2004-master-py3
       - ubuntu-1804-master-py3
-      - debian-11-3003-2-py3
-      - debian-10-3003-2-py3
-      - debian-9-3003-2-py3
-      - ubuntu-2004-3003-2-py3
-      - ubuntu-1804-3003-2-py3
-      - debian-11-3002-6-py3
-      - debian-10-3002-6-py3
-      - debian-9-3002-6-py3
-      - ubuntu-2004-3002-6-py3
-      - ubuntu-1804-3002-6-py3
-      - debian-10-3001-7-py3
-      - debian-9-3001-7-py3
-      - ubuntu-2004-3001-7-py3
-      - ubuntu-1804-3001-7-py3
-      - debian-10-3000-9-py3
-      - debian-9-3000-9-py3
-      - ubuntu-1804-3000-9-py3
-      - ubuntu-1804-3000-9-py2
+      - debian-11-3003-3-py3
+      - debian-10-3003-3-py3
+      - debian-9-3003-3-py3
+      - ubuntu-2004-3003-3-py3
+      - ubuntu-1804-3003-3-py3
+      - debian-11-3002-7-py3
+      - debian-10-3002-7-py3
+      - debian-9-3002-7-py3
+      - ubuntu-2004-3002-7-py3
+      - ubuntu-1804-3002-7-py3
+      - debian-10-3001-8-py3
+      - debian-9-3001-8-py3
+      - ubuntu-2004-3001-8-py3
+      - ubuntu-1804-3001-8-py3
     provisioner:
       dependencies:
         - name: states