diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd7cd98..9eca7da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,9 +174,6 @@ fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-fedora-35-master-py3: {extends: '.test_instance'}
 # repo-fedora-35-master-py3: {extends: '.test_instance'}
 fedora-35-master-py3: {extends: '.test_instance'}
-# default-fedora-34-master-py3: {extends: '.test_instance'}
-# repo-fedora-34-master-py3: {extends: '.test_instance'}
-fedora-34-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # repo-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 opensuse-leap-153-master-py3: {extends: '.test_instance'}
@@ -213,7 +210,6 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-centos-7-3004-1-py3: {extends: '.test_instance'}
 # default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
 # default-fedora-35-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-34-3004-1-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
@@ -234,14 +230,6 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
 # default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-debian-10-3002-8-py3: {extends: '.test_instance'}
-# default-debian-9-3002-8-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
-# default-centos-7-3002-8-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2cb381e..1299a84 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,6 +3,18 @@
 ---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+ci:
+  autofix_commit_msg: |
+    ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
+
+    For more information, see https://pre-commit.ci
+  autofix_prs: true
+  autoupdate_branch: ''
+  autoupdate_commit_msg: |
+    ci(pre-commit.ci): perform `pre-commit` autoupdate
+  autoupdate_schedule: quarterly
+  skip: []
+  submodules: false
 default_stages: [commit]
 repos:
   - repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@@ -18,7 +30,7 @@ repos:
         additional_dependencies: ['@commitlint/config-conventional@8.3.4']
         always_run: true
   - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.25.1
+    rev: v1.30.1
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
diff --git a/.travis.yml b/.travis.yml
index c8a609d..ee5708f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -126,9 +126,6 @@ jobs:
     # - env: INSTANCE=default-fedora-35-master-py3
     # - env: INSTANCE=repo-fedora-35-master-py3
     - env: INSTANCE=fedora-35-master-py3
-    # - env: INSTANCE=default-fedora-34-master-py3
-    # - env: INSTANCE=repo-fedora-34-master-py3
-    - env: INSTANCE=fedora-34-master-py3
     # - env: INSTANCE=default-opensuse-leap-153-master-py3
     # - env: INSTANCE=repo-opensuse-leap-153-master-py3
     - env: INSTANCE=opensuse-leap-153-master-py3
@@ -165,7 +162,6 @@ jobs:
     # - env: INSTANCE=default-centos-7-3004-1-py3
     # - env: INSTANCE=default-fedora-36-3004-1-py3
     # - env: INSTANCE=default-fedora-35-3004-1-py3
-    # - env: INSTANCE=default-fedora-34-3004-1-py3
     # - env: INSTANCE=default-amazonlinux-2-3004-1-py3
     # - env: INSTANCE=default-oraclelinux-8-3004-1-py3
     # - env: INSTANCE=default-oraclelinux-7-3004-1-py3
@@ -186,14 +182,6 @@ jobs:
     # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
     # - env: INSTANCE=default-oraclelinux-7-3003-4-py3
     # - env: INSTANCE=default-almalinux-8-3003-4-py3
-    # - env: INSTANCE=default-debian-10-3002-8-py3
-    # - env: INSTANCE=default-debian-9-3002-8-py3
-    # - env: INSTANCE=default-ubuntu-2004-3002-8-py3
-    # - env: INSTANCE=default-ubuntu-1804-3002-8-py3
-    # - env: INSTANCE=default-centos-7-3002-8-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-8-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-8-py3
-    # - env: INSTANCE=default-oraclelinux-7-3002-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index b98b29b..27df7a9 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -103,9 +103,6 @@ platforms:
   - name: fedora-35-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-35
-  - name: fedora-34-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-34
   - name: opensuse-leap-153-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.3
@@ -183,9 +180,6 @@ platforms:
   - name: fedora-35-3004-1-py3
     driver:
       image: saltimages/salt-3004.1-py3:fedora-35
-  - name: fedora-34-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:fedora-34
   - name: amazonlinux-2-3004-1-py3
     driver:
       image: saltimages/salt-3004.1-py3:amazonlinux-2
@@ -264,36 +258,6 @@ platforms:
     driver:
       image: saltimages/salt-3003.4-py3:almalinux-8
 
-  ## SALT `3002.8`
-  - name: debian-10-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-7-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:centos-7
-  - name: amazonlinux-2-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:oraclelinux-7
-
 verifier:
   # https://www.inspec.io/
   name: inspec
@@ -345,7 +309,6 @@ suites:
       - centos-7-master-py3
       - fedora-36-master-py3
       - fedora-35-master-py3
-      - fedora-34-master-py3
       - opensuse-leap-153-master-py3
       - amazonlinux-2-master-py3
       - oraclelinux-8-master-py3
@@ -362,7 +325,6 @@ suites:
       - centos-7-3004-1-py3
       - fedora-36-3004-1-py3
       - fedora-35-3004-1-py3
-      - fedora-34-3004-1-py3
       - amazonlinux-2-3004-1-py3
       - oraclelinux-8-3004-1-py3
       - oraclelinux-7-3004-1-py3
@@ -379,14 +341,6 @@ suites:
       - oraclelinux-8-3003-4-py3
       - oraclelinux-7-3003-4-py3
       - almalinux-8-3003-4-py3
-      - debian-10-3002-8-py3
-      - debian-9-3002-8-py3
-      - ubuntu-2004-3002-8-py3
-      - ubuntu-1804-3002-8-py3
-      - centos-7-3002-8-py3
-      - amazonlinux-2-3002-8-py3
-      - oraclelinux-8-3002-8-py3
-      - oraclelinux-7-3002-8-py3
     provisioner:
       state_top:
         base: