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 7f5bffe..1c4139a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,27 +137,22 @@ default-oraclelinux-8-master-py3: {extends: '.test_instance'}
 default-oraclelinux-7-master-py3: {extends: '.test_instance'}
 default-almalinux-8-master-py3: {extends: '.test_instance'}
 default-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-centos-8-3003-2-py3: {extends: '.test_instance'}
-# default-centos-7-3003-2-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
-# default-almalinux-8-3003-2-py3: {extends: '.test_instance'}
-# default-centos-8-3002-6-py3: {extends: '.test_instance'}
-# default-centos-7-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-centos-8-3001-7-py3: {extends: '.test_instance'}
-# default-centos-7-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-centos-8-3000-9-py3: {extends: '.test_instance'}
-# default-centos-7-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-centos-8-3003-3-py3: {extends: '.test_instance'}
+# default-centos-7-3003-3-py3: {extends: '.test_instance'}
+# 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'}
+# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
+# default-centos-8-3002-7-py3: {extends: '.test_instance'}
+# default-centos-7-3002-7-py3: {extends: '.test_instance'}
+# 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'}
+# default-centos-8-3001-8-py3: {extends: '.test_instance'}
+# default-centos-7-3001-8-py3: {extends: '.test_instance'}
+# 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'}
 
 ###############################################################################
 # `release` stage: `semantic-release`
diff --git a/.travis.yml b/.travis.yml
index 65c561b..9de0411 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,27 +97,22 @@ jobs:
     - env: INSTANCE=default-oraclelinux-7-master-py3
     - env: INSTANCE=default-almalinux-8-master-py3
     - env: INSTANCE=default-rockylinux-8-master-py3
-    # - env: INSTANCE=default-centos-8-3003-2-py3
-    # - env: INSTANCE=default-centos-7-3003-2-py3
-    # - env: INSTANCE=default-amazonlinux-2-3003-2-py3
-    # - env: INSTANCE=default-oraclelinux-8-3003-2-py3
-    # - env: INSTANCE=default-oraclelinux-7-3003-2-py3
-    # - env: INSTANCE=default-almalinux-8-3003-2-py3
-    # - env: INSTANCE=default-centos-8-3002-6-py3
-    # - env: INSTANCE=default-centos-7-3002-6-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-6-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-6-py3
-    # - env: INSTANCE=default-oraclelinux-7-3002-6-py3
-    # - env: INSTANCE=default-centos-8-3001-7-py3
-    # - env: INSTANCE=default-centos-7-3001-7-py3
-    # - env: INSTANCE=default-amazonlinux-2-3001-7-py3
-    # - env: INSTANCE=default-oraclelinux-8-3001-7-py3
-    # - env: INSTANCE=default-oraclelinux-7-3001-7-py3
-    # - env: INSTANCE=default-centos-8-3000-9-py3
-    # - env: INSTANCE=default-centos-7-3000-9-py3
-    # - env: INSTANCE=default-amazonlinux-2-3000-9-py3
-    # - env: INSTANCE=default-oraclelinux-8-3000-9-py3
-    # - env: INSTANCE=default-oraclelinux-7-3000-9-py3
+    # - env: INSTANCE=default-centos-8-3003-3-py3
+    # - env: INSTANCE=default-centos-7-3003-3-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-3-py3
+    # - env: INSTANCE=default-oraclelinux-8-3003-3-py3
+    # - env: INSTANCE=default-oraclelinux-7-3003-3-py3
+    # - env: INSTANCE=default-almalinux-8-3003-3-py3
+    # - env: INSTANCE=default-centos-8-3002-7-py3
+    # - env: INSTANCE=default-centos-7-3002-7-py3
+    # - env: INSTANCE=default-amazonlinux-2-3002-7-py3
+    # - env: INSTANCE=default-oraclelinux-8-3002-7-py3
+    # - env: INSTANCE=default-oraclelinux-7-3002-7-py3
+    # - env: INSTANCE=default-centos-8-3001-8-py3
+    # - env: INSTANCE=default-centos-7-3001-8-py3
+    # - env: INSTANCE=default-amazonlinux-2-3001-8-py3
+    # - env: INSTANCE=default-oraclelinux-8-3001-8-py3
+    # - env: INSTANCE=default-oraclelinux-7-3001-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index 2b701c8..20b5818 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -66,76 +66,59 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:rockylinux-8
 
-  ## SALT `3003.2`
-  - name: centos-8-3003-2-py3
+  ## SALT `3003.3`
+  - 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: amazonlinux-2-3003-2-py3
+      image: saltimages/salt-3003.3-py3:centos-7
+  - 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: almalinux-8-3003-2-py3
+      image: saltimages/salt-3003.3-py3:oraclelinux-7
+  - name: almalinux-8-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:almalinux-8
+      image: saltimages/salt-3003.3-py3:almalinux-8
 
-  ## SALT `3002.6`
-  - name: centos-8-3002-6-py3
+  ## SALT `3002.7`
+  - name: centos-8-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:centos-8
-  - name: centos-7-3002-6-py3
+      image: saltimages/salt-3002.7-py3:centos-8
+  - name: centos-7-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:centos-7
-  - name: amazonlinux-2-3002-6-py3
+      image: saltimages/salt-3002.7-py3:centos-7
+  - name: amazonlinux-2-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-6-py3
+      image: saltimages/salt-3002.7-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-6-py3
+      image: saltimages/salt-3002.7-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:oraclelinux-7
+      image: saltimages/salt-3002.7-py3:oraclelinux-7
 
-  ## SALT `3001.7`
-  - name: centos-8-3001-7-py3
+  ## SALT `3001.8`
+  - 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: amazonlinux-2-3001-7-py3
+      image: saltimages/salt-3001.8-py3:centos-7
+  - name: amazonlinux-2-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-7-py3
+      image: saltimages/salt-3001.8-py3:amazonlinux-2
+  - name: oraclelinux-8-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-7-py3
+      image: saltimages/salt-3001.8-py3:oraclelinux-8
+  - name: oraclelinux-7-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:oraclelinux-7
-
-  ## SALT `3000.9`
-  - 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: 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.9-py3:oraclelinux-8
-  - name: oraclelinux-7-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:oraclelinux-7
+      image: saltimages/salt-3001.8-py3:oraclelinux-7
 
 verifier:
   # https://www.inspec.io/