diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index 99a948b8178d767470c418af90d1311b87d669db..cac0844164b5dcfec198eb8cc3a32a58a2312b11 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -18,8 +18,8 @@ jobs:
           # - freebsd-130-master-py3
           - default-freebsd-122-master-py3
           # - freebsd-122-master-py3
-          # - default-freebsd-130-3003-1-py3
-          # - default-freebsd-122-3003-1-py3
+          # - default-freebsd-130-3004-0-py3
+          # - default-freebsd-122-3004-0-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4cf3cf6565387a43f3f371648afb275e89af5911..1b4c069c0158b9d601b26144ebdd01bfd3972740 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -135,6 +135,7 @@ rubocop:
 # 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-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
 # default-centos-8-tiamat-py3: {extends: '.test_instance'}
 # default-centos-7-tiamat-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
@@ -157,6 +158,9 @@ ubuntu-2004-master-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # repo-ubuntu-1804-master-py3: {extends: '.test_instance'}
 ubuntu-1804-master-py3: {extends: '.test_instance'}
+# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
+# repo-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
+centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-centos-8-master-py3: {extends: '.test_instance'}
 # repo-centos-8-master-py3: {extends: '.test_instance'}
 centos-8-master-py3: {extends: '.test_instance'}
@@ -175,8 +179,8 @@ opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # repo-opensuse-leap-152-master-py3: {extends: '.test_instance_failure_permitted'}
 opensuse-leap-152-master-py3: {extends: '.test_instance_failure_permitted'}
-default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
-# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
+# opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # repo-amazonlinux-2-master-py3: {extends: '.test_instance'}
 amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -198,18 +202,40 @@ almalinux-8-master-py3: {extends: '.test_instance'}
 # default-rockylinux-8-master-py3: {extends: '.test_instance'}
 # repo-rockylinux-8-master-py3: {extends: '.test_instance'}
 rockylinux-8-master-py3: {extends: '.test_instance'}
+# default-debian-11-3004-0-py3: {extends: '.test_instance'}
+# default-debian-10-3004-0-py3: {extends: '.test_instance'}
+# default-debian-9-3004-0-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
+# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
+# default-centos-8-3004-0-py3: {extends: '.test_instance'}
+# default-centos-7-3004-0-py3: {extends: '.test_instance'}
+# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
+# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
+# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
+# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
+# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
 # default-debian-11-3003-3-py3: {extends: '.test_instance'}
 # default-debian-10-3003-3-py3: {extends: '.test_instance'}
 # default-debian-9-3003-3-py3: {extends: '.test_instance'}
 # default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
+# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
 # default-centos-8-3003-3-py3: {extends: '.test_instance'}
 # default-centos-7-3003-3-py3: {extends: '.test_instance'}
 # default-fedora-34-3003-3-py3: {extends: '.test_instance'}
 # default-fedora-33-3003-3-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
@@ -228,7 +254,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-fedora-33-3002-7-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
@@ -245,7 +271,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-fedora-33-3001-8-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
diff --git a/.travis.yml b/.travis.yml
index 83b761fc282bd48a718db6caaef94e97c50a5bd9..7e14625180e3650fce54121f294f167a20b0dc15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,6 +88,7 @@ jobs:
     # - env: INSTANCE=default-debian-9-tiamat-py3
     # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
+    # - env: INSTANCE=default-centos-stream8-tiamat-py3
     # - env: INSTANCE=default-centos-8-tiamat-py3
     # - env: INSTANCE=default-centos-7-tiamat-py3
     # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
@@ -110,6 +111,9 @@ jobs:
     # - env: INSTANCE=default-ubuntu-1804-master-py3
     # - env: INSTANCE=repo-ubuntu-1804-master-py3
     - env: INSTANCE=ubuntu-1804-master-py3
+    # - env: INSTANCE=default-centos-stream8-master-py3
+    # - env: INSTANCE=repo-centos-stream8-master-py3
+    - env: INSTANCE=centos-stream8-master-py3
     # - env: INSTANCE=default-centos-8-master-py3
     # - env: INSTANCE=repo-centos-8-master-py3
     - env: INSTANCE=centos-8-master-py3
@@ -151,11 +155,33 @@ jobs:
     # - env: INSTANCE=default-rockylinux-8-master-py3
     # - env: INSTANCE=repo-rockylinux-8-master-py3
     - env: INSTANCE=rockylinux-8-master-py3
+    # - env: INSTANCE=default-debian-11-3004-0-py3
+    # - env: INSTANCE=default-debian-10-3004-0-py3
+    # - env: INSTANCE=default-debian-9-3004-0-py3
+    # - env: INSTANCE=default-ubuntu-2004-3004-0-py3
+    # - env: INSTANCE=default-ubuntu-1804-3004-0-py3
+    # - env: INSTANCE=default-centos-stream8-3004-0-py3
+    # - env: INSTANCE=default-centos-8-3004-0-py3
+    # - env: INSTANCE=default-centos-7-3004-0-py3
+    # - env: INSTANCE=default-fedora-34-3004-0-py3
+    # - env: INSTANCE=default-fedora-33-3004-0-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
+    # - env: INSTANCE=default-amazonlinux-2-3004-0-py3
+    # - env: INSTANCE=default-oraclelinux-8-3004-0-py3
+    # - env: INSTANCE=default-oraclelinux-7-3004-0-py3
+    # - env: INSTANCE=default-arch-base-latest-3004-0-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
+    # - env: INSTANCE=default-almalinux-8-3004-0-py3
+    # - env: INSTANCE=default-rockylinux-8-3004-0-py3
     # - env: INSTANCE=default-debian-11-3003-3-py3
     # - env: INSTANCE=default-debian-10-3003-3-py3
     # - env: INSTANCE=default-debian-9-3003-3-py3
     # - env: INSTANCE=default-ubuntu-2004-3003-3-py3
     # - env: INSTANCE=default-ubuntu-1804-3003-3-py3
+    # - env: INSTANCE=default-centos-stream8-3003-3-py3
     # - env: INSTANCE=default-centos-8-3003-3-py3
     # - env: INSTANCE=default-centos-7-3003-3-py3
     # - env: INSTANCE=default-fedora-34-3003-3-py3
diff --git a/CODEOWNERS b/CODEOWNERS
index 8190f5a0e879e0cf13a3f74abfd48183f218f866..ee2371074bd69dea460318d3514c453d31eff953 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -22,6 +22,7 @@
 /test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
+/test/salt/pillar/top.sls                   @saltstack-formulas/ssf
 /.gitignore                                 @saltstack-formulas/ssf
 /.cirrus.yml                                @saltstack-formulas/ssf
 /.gitlab-ci.yml                             @saltstack-formulas/ssf
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index eff870aecf6fb49a7b877070786b8e47427a6f10..a6e7bc39824aac09c0d7584cfe5a0579c1a51549 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -25,10 +25,10 @@ platforms:
   - name: freebsd-122-master-py3
     driver:
       box: myii/freebsd-12.2-master-py3
-  - name: freebsd-130-3003-1-py3
+  - name: freebsd-130-3004-0-py3
     driver:
-      box: myii/freebsd-13.0-3003.1-py3
+      box: myii/freebsd-13.0-3004.0-py3
       synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
-  - name: freebsd-122-3003-1-py3
+  - name: freebsd-122-3004-0-py3
     driver:
-      box: myii/freebsd-12.2-3003.1-py3
+      box: myii/freebsd-12.2-3004.0-py3
diff --git a/kitchen.yml b/kitchen.yml
index b4816895bee2d0b6f78ccde7fcbef40995656ac8..cb121152990e68a3ad4356dd924932383b75768b 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -40,6 +40,9 @@ platforms:
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+  - name: centos-stream8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:centos-stream8
   - name: centos-8-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-8
@@ -83,6 +86,9 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+  - name: centos-stream8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:centos-stream8
   - name: centos-8-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-8
@@ -142,6 +148,89 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:rockylinux-8
 
+  ## SALT `3004.0`
+  - name: debian-11-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-11
+      run_command: /lib/systemd/systemd
+  - name: debian-10-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-10
+      run_command: /lib/systemd/systemd
+  - name: debian-9-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-9
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2004-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-1804-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+  - name: centos-stream8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:centos-stream8
+  - name: centos-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:centos-8
+  - name: centos-7-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:centos-7
+  - name: fedora-34-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:fedora-34
+  - name: fedora-33-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:fedora-33
+  - name: opensuse-leap-153-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-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-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-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-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-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-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:amazonlinux-2
+  - name: oraclelinux-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:oraclelinux-8
+  - name: oraclelinux-7-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:oraclelinux-7
+  - name: arch-base-latest-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd
+  - name: almalinux-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:almalinux-8
+  - name: rockylinux-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:rockylinux-8
+
   ## SALT `3003.3`
   - name: debian-11-3003-3-py3
     driver:
@@ -163,6 +252,9 @@ platforms:
     driver:
       image: saltimages/salt-3003.3-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+  - name: centos-stream8-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:centos-stream8
   - name: centos-8-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:centos-8
@@ -396,6 +488,7 @@ suites:
       - debian-9-tiamat-py3
       - ubuntu-2004-tiamat-py3
       - ubuntu-1804-tiamat-py3
+      - centos-stream8-tiamat-py3
       - centos-8-tiamat-py3
       - centos-7-tiamat-py3
       - amazonlinux-2-tiamat-py3
@@ -408,6 +501,7 @@ suites:
       - debian-9-master-py3
       - ubuntu-2004-master-py3
       - ubuntu-1804-master-py3
+      - centos-stream8-master-py3
       - centos-8-master-py3
       - centos-7-master-py3
       - fedora-34-master-py3
@@ -419,11 +513,29 @@ suites:
       - oraclelinux-7-master-py3
       - almalinux-8-master-py3
       - rockylinux-8-master-py3
+      - debian-11-3004-0-py3
+      - debian-10-3004-0-py3
+      - debian-9-3004-0-py3
+      - ubuntu-2004-3004-0-py3
+      - ubuntu-1804-3004-0-py3
+      - centos-stream8-3004-0-py3
+      - centos-8-3004-0-py3
+      - centos-7-3004-0-py3
+      - fedora-34-3004-0-py3
+      - fedora-33-3004-0-py3
+      - opensuse-leap-153-3004-0-py3
+      - opensuse-leap-152-3004-0-py3
+      - amazonlinux-2-3004-0-py3
+      - oraclelinux-8-3004-0-py3
+      - oraclelinux-7-3004-0-py3
+      - almalinux-8-3004-0-py3
+      - rockylinux-8-3004-0-py3
       - 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
+      - centos-stream8-3003-3-py3
       - centos-8-3003-3-py3
       - centos-7-3003-3-py3
       - fedora-34-3003-3-py3