diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index 9d34048..7d090c3 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -20,9 +20,9 @@ jobs:
           # - freebsd-122-master-py3
           - default-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
+          # - default-freebsd-130-3003-1-py3
+          # - default-freebsd-122-3003-1-py3
+          # - default-freebsd-114-3003-1-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2776168..747a402 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,7 @@ rubocop:
 ###############################################################################
 # Define `test` template
 ###############################################################################
-.test_instance:
+.test_instance: &test_instance
   stage: *stage_test
   image: *image_dindruby
   services: *services_docker_dind
@@ -117,12 +117,20 @@ rubocop:
     # Alternative value to consider: `${CI_JOB_NAME}`
     - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'
 
+###############################################################################
+# Define `test` template (`allow_failure: true`)
+###############################################################################
+.test_instance_failure_permitted:
+  <<: *test_instance
+  allow_failure: true
+
 ###############################################################################
 # `test` stage: each instance below uses the `test` template above
 ###############################################################################
 ## Define the rest of the matrix based on Kitchen testing
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
+# default-debian-11-tiamat-py3: {extends: '.test_instance'}
 # default-debian-10-tiamat-py3: {extends: '.test_instance'}
 # default-debian-9-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
@@ -134,6 +142,9 @@ rubocop:
 # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
 # default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
 # default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
+# default-debian-11-master-py3: {extends: '.test_instance'}
+# passenger-debian-11-master-py3: {extends: '.test_instance'}
+debian-11-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-debian-10-master-py3: {extends: '.test_instance'}
 # passenger-debian-10-master-py3: {extends: '.test_instance'}
 debian-10-master-py3: {extends: '.test_instance'}
@@ -149,9 +160,9 @@ ubuntu-1804-master-py3: {extends: '.test_instance'}
 # default-centos-8-master-py3: {extends: '.test_instance'}
 # passenger-centos-8-master-py3: {extends: '.test_instance'}
 centos-8-master-py3: {extends: '.test_instance'}
-default-centos-7-master-py3: {extends: '.test_instance'}
+# default-centos-7-master-py3: {extends: '.test_instance'}
 # passenger-centos-7-master-py3: {extends: '.test_instance'}
-# centos-7-master-py3: {extends: '.test_instance'}
+centos-7-master-py3: {extends: '.test_instance'}
 default-fedora-34-master-py3: {extends: '.test_instance'}
 # fedora-34-master-py3: {extends: '.test_instance'}
 default-fedora-33-master-py3: {extends: '.test_instance'}
@@ -181,6 +192,7 @@ almalinux-8-master-py3: {extends: '.test_instance'}
 # default-rockylinux-8-master-py3: {extends: '.test_instance'}
 # passenger-rockylinux-8-master-py3: {extends: '.test_instance'}
 rockylinux-8-master-py3: {extends: '.test_instance'}
+# default-debian-11-3003-1-py3: {extends: '.test_instance'}
 # default-debian-10-3003-1-py3: {extends: '.test_instance'}
 # default-debian-9-3003-1-py3: {extends: '.test_instance'}
 # default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
@@ -198,6 +210,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
+# default-debian-11-3002-6-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'}
diff --git a/.travis.yml b/.travis.yml
index 2b7acd3..412facf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,6 +83,7 @@ jobs:
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
+    # - env: INSTANCE=default-debian-11-tiamat-py3
     # - env: INSTANCE=default-debian-10-tiamat-py3
     # - env: INSTANCE=default-debian-9-tiamat-py3
     # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
@@ -94,6 +95,9 @@ jobs:
     # - env: INSTANCE=default-oraclelinux-7-tiamat-py3
     # - env: INSTANCE=default-almalinux-8-tiamat-py3
     # - env: INSTANCE=default-rockylinux-8-tiamat-py3
+    # - env: INSTANCE=default-debian-11-master-py3
+    # - env: INSTANCE=passenger-debian-11-master-py3
+    - env: INSTANCE=debian-11-master-py3
     # - env: INSTANCE=default-debian-10-master-py3
     # - env: INSTANCE=passenger-debian-10-master-py3
     - env: INSTANCE=debian-10-master-py3
@@ -109,9 +113,9 @@ jobs:
     # - env: INSTANCE=default-centos-8-master-py3
     # - env: INSTANCE=passenger-centos-8-master-py3
     - env: INSTANCE=centos-8-master-py3
-    - env: INSTANCE=default-centos-7-master-py3
+    # - env: INSTANCE=default-centos-7-master-py3
     # - env: INSTANCE=passenger-centos-7-master-py3
-    # - env: INSTANCE=centos-7-master-py3
+    - env: INSTANCE=centos-7-master-py3
     - env: INSTANCE=default-fedora-34-master-py3
     # - env: INSTANCE=fedora-34-master-py3
     - env: INSTANCE=default-fedora-33-master-py3
@@ -141,6 +145,7 @@ jobs:
     # - env: INSTANCE=default-rockylinux-8-master-py3
     # - env: INSTANCE=passenger-rockylinux-8-master-py3
     - env: INSTANCE=rockylinux-8-master-py3
+    # - env: INSTANCE=default-debian-11-3003-1-py3
     # - env: INSTANCE=default-debian-10-3003-1-py3
     # - env: INSTANCE=default-debian-9-3003-1-py3
     # - env: INSTANCE=default-ubuntu-2004-3003-1-py3
@@ -158,6 +163,7 @@ jobs:
     # - env: INSTANCE=default-arch-base-latest-3003-1-py3
     # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3
     # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3
+    # - env: INSTANCE=default-debian-11-3002-6-py3
     # - env: INSTANCE=default-debian-10-3002-6-py3
     # - env: INSTANCE=default-debian-9-3002-6-py3
     # - env: INSTANCE=default-ubuntu-2004-3002-6-py3
diff --git a/.yamllint b/.yamllint
index f9a94a4..0864486 100644
--- a/.yamllint
+++ b/.yamllint
@@ -5,13 +5,15 @@
 extends: 'default'
 
 # Files to ignore completely
-# 1. All YAML files under directory `.cache/`, introduced during the GitLab CI run
-# 2. All YAML files under directory `.git/`
-# 3. All YAML files under directory `node_modules/`, introduced during the Travis run
-# 4. Any SLS files under directory `test/`, which are actually state files
-# 5. Any YAML files under directory `.kitchen/`, introduced during local testing
-# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
+# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
+# 2. All YAML files under directory `.cache/`, introduced during the CI run
+# 3. All YAML files under directory `.git/`
+# 4. All YAML files under directory `node_modules/`, introduced during the CI run
+# 5. Any SLS files under directory `test/`, which are actually state files
+# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
+# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
 ignore: |
+  .bundle/
   .cache/
   .git/
   node_modules/
diff --git a/Gemfile b/Gemfile
index 8be107e..f4bb330 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem 'inspec',      '~> 4.22.22'
 # rubocop:disable Layout/LineLength
 gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
 # rubocop:enable Layout/LineLength
-gem 'kitchen-inspec', '>= 2.2.1'
+gem 'kitchen-inspec', '>= 2.5.0'
 gem 'kitchen-salt', '>= 0.6.3'
 
 group :vagrant do
diff --git a/Gemfile.lock b/Gemfile.lock
index e2f62f3..23d2d0d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,197 +9,242 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.386.0)
-    aws-sdk-apigateway (1.55.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.479.0)
+    aws-sdk-apigateway (1.62.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewayv2 (1.29.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-apigatewayv2 (1.32.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.33.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-applicationautoscaling (1.51.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.22.0)
-      aws-sdk-core (~> 3, >= 3.52.1)
+    aws-sdk-athena (1.37.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.36.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-autoscaling (1.61.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.44.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-batch (1.47.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-budgets (1.38.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsm (1.27.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudformation (1.53.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsmv2 (1.30.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudfront (1.53.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.29.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudhsm (1.30.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.45.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudhsmv2 (1.33.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.38.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudtrail (1.35.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codecommit (1.40.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudwatch (1.51.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.37.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudwatchevents (1.46.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codepipeline (1.37.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudwatchlogs (1.41.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-codecommit (1.42.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.109.1)
+    aws-sdk-codedeploy (1.40.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codepipeline (1.44.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cognitoidentity (1.31.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cognitoidentityprovider (1.51.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-configservice (1.62.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.117.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-costandusagereportservice (1.28.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-costandusagereportservice (1.31.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.55.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-databasemigrationservice (1.53.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.202.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-dynamodb (1.60.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ec2 (1.251.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.70.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ecr (1.42.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.36.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ecrpublic (1.3.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.45.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ecs (1.81.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.44.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-efs (1.40.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-eks (1.58.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancing (1.29.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticache (1.57.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticbeanstalk (1.42.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticsearchservice (1.43.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticloadbalancing (1.31.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-firehose (1.35.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticloadbalancingv2 (1.64.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.42.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticsearchservice (1.52.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-eventbridge (1.24.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.29.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-firehose (1.37.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.30.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-glue (1.87.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-guardduty (1.45.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.51.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-iam (1.57.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-organizations (1.17.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-rds (1.104.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kafka (1.36.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.50.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kinesis (1.32.1)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.44.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.44.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53domains (1.28.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-lambda (1.64.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53resolver (1.21.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-organizations (1.59.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ram (1.25.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-rds (1.122.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-redshift (1.65.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53 (1.49.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53domains (1.30.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53resolver (1.26.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.96.2)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.35.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-secretsmanager (1.46.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ses (1.36.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-securityhub (1.48.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sms (1.27.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-servicecatalog (1.59.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.34.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ses (1.38.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.34.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-shield (1.37.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.95.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-sms (1.29.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sdk-sns (1.42.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.40.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ssm (1.112.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-states (1.39.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-transfer (1.32.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.4)
       aws-eventstream (~> 1, >= 1.0.2)
     azure_graph_rbac (0.17.2)
       ms_rest_azure (~> 0.12.0)
-    azure_mgmt_key_vault (0.17.6)
+    azure_mgmt_key_vault (0.17.7)
       ms_rest_azure (~> 0.12.0)
-    azure_mgmt_resources (0.18.0)
+    azure_mgmt_resources (0.18.2)
       ms_rest_azure (~> 0.12.0)
-    azure_mgmt_security (0.18.2)
+    azure_mgmt_security (0.19.0)
       ms_rest_azure (~> 0.12.0)
-    azure_mgmt_storage (0.22.0)
+    azure_mgmt_storage (0.23.0)
       ms_rest_azure (~> 0.12.0)
-    bcrypt_pbkdf (1.0.1)
+    bcrypt_pbkdf (1.1.0)
     builder (3.2.4)
-    chef-config (16.6.14)
+    chef-config (17.3.48)
       addressable
-      chef-utils (= 16.6.14)
+      chef-utils (= 17.3.48)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-telemetry (1.0.14)
+    chef-telemetry (1.0.29)
       chef-config
       concurrent-ruby (~> 1.0)
-      ffi-yajl (~> 2.2)
-    chef-utils (16.6.14)
+    chef-utils (17.3.48)
+      concurrent-ruby
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     declarative (0.0.20)
-    declarative-option (0.1.0)
     diff-lcs (1.4.4)
-    docker-api (2.0.0)
+    docker-api (2.2.0)
       excon (>= 0.47.0)
       multi_json
     domain_name (0.5.20190701)
@@ -207,44 +252,43 @@ GEM
     ecma-re-validator (0.2.1)
       regexp_parser (~> 1.2)
     ed25519 (1.2.4)
-    erubi (1.9.0)
-    excon (0.78.0)
-    faraday (0.17.3)
+    erubi (1.10.0)
+    excon (0.85.0)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.13.1)
-    ffi-yajl (2.3.4)
-      libyajl2 (~> 1.2)
+    ffi (1.15.3)
     fuzzyurl (0.9.0)
-    google-api-client (0.44.0)
+    google-api-client (0.52.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
+      rexml
       signet (~> 0.12)
-    googleauth (0.13.0)
+    googleauth (0.14.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
-    gssapi (1.3.0)
+    gssapi (1.3.1)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hana (1.3.6)
+    hana (1.3.7)
     hashie (3.6.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     inifile (3.0.0)
     inspec (4.22.22)
@@ -278,23 +322,22 @@ GEM
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
     jmespath (1.4.0)
-    json (2.3.1)
+    json (2.5.1)
     json_schemer (0.2.11)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
       uri_template (~> 0.7)
-    jwt (2.2.2)
-    kitchen-inspec (2.2.1)
-      hashie (~> 3.4)
+    jwt (2.2.3)
+    kitchen-inspec (2.5.0)
+      hashie (>= 3.4, <= 5.0)
       inspec (>= 2.2.64, < 5.0)
-      test-kitchen (>= 2.7, < 3)
+      test-kitchen (>= 2.7, < 4)
     kitchen-salt (0.6.3)
       hashie (>= 3.5)
       test-kitchen (>= 1.4)
-    kitchen-vagrant (1.7.0)
-      test-kitchen (>= 1.4, < 3)
-    libyajl2 (1.2.0)
+    kitchen-vagrant (1.9.0)
+      test-kitchen (>= 1.4, < 4)
     license-acceptance (1.0.19)
       pastel (~> 0.7)
       tomlrb (~> 1.2)
@@ -306,16 +349,16 @@ GEM
       multi_json (~> 1.14)
     memoist (0.16.2)
     method_source (1.0.0)
-    mini_mime (1.0.2)
-    minitest (5.14.2)
+    mini_mime (1.1.0)
+    minitest (5.14.4)
     mixlib-config (3.0.9)
       tomlrb
-    mixlib-install (3.12.3)
+    mixlib-install (3.12.11)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (3.0.9)
-    mixlib-shellout (3.1.6)
+    mixlib-shellout (3.2.5)
       chef-utils
     mixlib-versioning (1.2.12)
     ms_rest (0.7.6)
@@ -336,52 +379,54 @@ GEM
       net-ssh (>= 4.0.0)
     nori (2.6.0)
     os (1.1.1)
-    parallel (1.19.2)
+    parallel (1.20.1)
     parslet (1.8.2)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
     regexp_parser (1.8.2)
-    representable (3.0.4)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.3)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
-    rubyntlm (0.6.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubyntlm (0.6.3)
     rubyzip (1.3.0)
     semverse (3.0.0)
-    signet (0.14.0)
+    signet (0.15.0)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     sslshake (1.3.1)
-    strings (0.2.0)
+    strings (0.2.1)
       strings-ansi (~> 0.2)
-      unicode-display_width (~> 1.5)
+      unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    test-kitchen (2.7.2)
+    test-kitchen (3.0.0)
       bcrypt_pbkdf (~> 1.0)
+      chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)
       mixlib-install (~> 3.6)
@@ -393,28 +438,30 @@ GEM
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
+    thor (1.1.0)
     timeliness (0.3.10)
     tomlrb (1.2.9)
-    train (3.3.27)
-      activesupport (>= 5.2.4.3, < 6.0.0)
+    trailblazer-option (0.1.1)
+    train (3.7.4)
+      activesupport (>= 6.0.3.1)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
       azure_mgmt_resources (~> 0.15)
       azure_mgmt_security (~> 0.18)
       azure_mgmt_storage (~> 0.18)
       docker-api (>= 1.26, < 3.0)
-      google-api-client (>= 0.23.9, < 0.44.1)
-      googleauth (>= 0.6.6, < 0.13.1)
+      google-api-client (>= 0.23.9, <= 0.52.0)
+      googleauth (>= 0.6.6, <= 0.14.0)
       inifile (~> 3.0)
-      train-core (= 3.3.27)
+      train-core (= 3.7.4)
       train-winrm (~> 0.2)
-    train-aws (0.1.18)
+    train-aws (0.2.8)
       aws-sdk-apigateway (~> 1.0)
       aws-sdk-apigatewayv2 (~> 1.0)
+      aws-sdk-applicationautoscaling (>= 1.46, < 1.52)
       aws-sdk-athena (~> 1.0)
-      aws-sdk-autoscaling (~> 1.22.0)
+      aws-sdk-autoscaling (>= 1.22, < 1.62)
+      aws-sdk-batch (>= 1.36, < 1.48)
       aws-sdk-budgets (~> 1.0)
       aws-sdk-cloudformation (~> 1.0)
       aws-sdk-cloudfront (~> 1.0)
@@ -422,16 +469,21 @@ GEM
       aws-sdk-cloudhsmv2 (~> 1.0)
       aws-sdk-cloudtrail (~> 1.8)
       aws-sdk-cloudwatch (~> 1.13)
+      aws-sdk-cloudwatchevents (>= 1.36, < 1.47)
       aws-sdk-cloudwatchlogs (~> 1.13)
       aws-sdk-codecommit (~> 1.0)
       aws-sdk-codedeploy (~> 1.0)
       aws-sdk-codepipeline (~> 1.0)
+      aws-sdk-cognitoidentity (>= 1.26, < 1.32)
+      aws-sdk-cognitoidentityprovider (>= 1.46, < 1.52)
       aws-sdk-configservice (~> 1.21)
       aws-sdk-core (~> 3.0)
       aws-sdk-costandusagereportservice (~> 1.6)
+      aws-sdk-databasemigrationservice (>= 1.42, < 1.54)
       aws-sdk-dynamodb (~> 1.31)
       aws-sdk-ec2 (~> 1.70)
       aws-sdk-ecr (~> 1.18)
+      aws-sdk-ecrpublic (~> 1.3)
       aws-sdk-ecs (~> 1.30)
       aws-sdk-efs (~> 1.0)
       aws-sdk-eks (~> 1.9)
@@ -440,48 +492,56 @@ GEM
       aws-sdk-elasticloadbalancing (~> 1.8)
       aws-sdk-elasticloadbalancingv2 (~> 1.0)
       aws-sdk-elasticsearchservice (~> 1.0)
+      aws-sdk-eventbridge (~> 1.24.0)
       aws-sdk-firehose (~> 1.0)
+      aws-sdk-glue (>= 1.71, < 1.88)
       aws-sdk-guardduty (~> 1.31)
       aws-sdk-iam (~> 1.13)
       aws-sdk-kafka (~> 1.0)
       aws-sdk-kinesis (~> 1.0)
       aws-sdk-kms (~> 1.13)
       aws-sdk-lambda (~> 1.0)
-      aws-sdk-organizations (~> 1.17.0)
+      aws-sdk-organizations (>= 1.17, < 1.60)
+      aws-sdk-ram (>= 1.21, < 1.26)
       aws-sdk-rds (~> 1.43)
       aws-sdk-redshift (~> 1.0)
       aws-sdk-route53 (~> 1.0)
       aws-sdk-route53domains (~> 1.0)
       aws-sdk-route53resolver (~> 1.0)
       aws-sdk-s3 (~> 1.30)
+      aws-sdk-secretsmanager (>= 1.42, < 1.47)
       aws-sdk-securityhub (~> 1.0)
+      aws-sdk-servicecatalog (>= 1.48, < 1.60)
       aws-sdk-ses (~> 1.0)
+      aws-sdk-shield (~> 1.30)
       aws-sdk-sms (~> 1.0)
       aws-sdk-sns (~> 1.9)
       aws-sdk-sqs (~> 1.10)
       aws-sdk-ssm (~> 1.0)
-    train-core (3.3.27)
+      aws-sdk-states (>= 1.35, < 1.40)
+      aws-sdk-transfer (>= 1.26, < 1.33)
+    train-core (3.7.4)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 4.0)
       net-ssh (>= 2.9, < 7.0)
-    train-habitat (0.2.13)
-    train-winrm (0.2.11)
-      winrm (~> 2.0)
+    train-habitat (0.2.22)
+    train-winrm (0.2.12)
+      winrm (>= 2.3.6, < 3.0)
       winrm-elevated (~> 1.2.2)
       winrm-fs (~> 1.0)
-    tty-box (0.6.0)
+    tty-box (0.7.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-cursor (~> 0.7)
-    tty-color (0.5.2)
+    tty-color (0.6.0)
     tty-cursor (0.7.1)
-    tty-prompt (0.22.0)
+    tty-prompt (0.23.1)
       pastel (~> 0.8)
       tty-reader (~> 0.8)
-    tty-reader (0.8.0)
+    tty-reader (0.9.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
@@ -490,16 +550,16 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     unicode_utils (1.4.0)
     uri_template (0.7.0)
-    winrm (2.3.5)
+    winrm (2.3.6)
       builder (>= 2.1.2)
       erubi (~> 1.8)
       gssapi (~> 1.2)
@@ -507,8 +567,8 @@ GEM
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.2.2)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    winrm-elevated (1.2.3)
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
@@ -518,6 +578,7 @@ GEM
       rubyzip (~> 1.1)
       winrm (~> 2.0)
     wisper (2.0.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -525,7 +586,7 @@ PLATFORMS
 DEPENDENCIES
   inspec (~> 4.22.22)
   kitchen-docker!
-  kitchen-inspec (>= 2.2.1)
+  kitchen-inspec (>= 2.5.0)
   kitchen-salt (>= 0.6.3)
   kitchen-vagrant
 
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index 542ba90..2197d92 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -28,13 +28,13 @@ platforms:
   - name: freebsd-114-master-py3
     driver:
       box: myii/freebsd-11.4-master-py3
-  - name: freebsd-130-3002-6-py3
+  - name: freebsd-130-3003-1-py3
     driver:
-      box: myii/freebsd-13.0-3002.6-py3
+      box: myii/freebsd-13.0-3003.1-py3
       synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
-  - name: freebsd-122-3002-6-py3
+  - name: freebsd-122-3003-1-py3
     driver:
-      box: myii/freebsd-12.2-3002.6-py3
-  - name: freebsd-114-3002-6-py3
+      box: myii/freebsd-12.2-3003.1-py3
+  - name: freebsd-114-3003-1-py3
     driver:
-      box: myii/freebsd-11.4-3002.6-py3
+      box: myii/freebsd-11.4-3003.1-py3
diff --git a/kitchen.yml b/kitchen.yml
index 6a38258..7c56d88 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -6,22 +6,40 @@ driver:
   name: docker
   use_sudo: false
   privileged: true
-  run_command: /lib/systemd/systemd
+  run_command: /usr/lib/systemd/systemd
+
+provisioner:
+  name: salt_solo
+  log_level: debug
+  salt_install: none
+  require_chef: false
+  formula: nginx
+  salt_copy_filter:
+    - .kitchen
+    - .git
 
 platforms:
   ## SALT `tiamat`
+  - name: debian-11-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:debian-11
+      run_command: /lib/systemd/systemd
   - name: debian-10-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:debian-10
+      run_command: /lib/systemd/systemd
   - name: debian-9-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:debian-9
+      run_command: /lib/systemd/systemd
   - name: ubuntu-2004-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
   - name: ubuntu-1804-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
   - name: centos-8-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-8
@@ -45,18 +63,26 @@ platforms:
       image: saltimages/salt-tiamat-py3:rockylinux-8
 
   ## SALT `master`
+  - name: debian-11-master-py3
+    driver:
+      image: saltimages/salt-master-py3:debian-11
+      run_command: /lib/systemd/systemd
   - name: debian-10-master-py3
     driver:
       image: saltimages/salt-master-py3:debian-10
+      run_command: /lib/systemd/systemd
   - name: debian-9-master-py3
     driver:
       image: saltimages/salt-master-py3:debian-9
+      run_command: /lib/systemd/systemd
   - name: ubuntu-2004-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
   - name: ubuntu-1804-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
   - name: centos-8-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-8
@@ -72,7 +98,6 @@ platforms:
   - name: opensuse-leap-153-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.3
-      run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
@@ -80,7 +105,6 @@ platforms:
   - name: opensuse-leap-152-master-py3
     driver:
       image: saltimages/salt-master-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:
@@ -88,7 +112,6 @@ platforms:
   - name: opensuse-tmbl-latest-master-py3
     driver:
       image: saltimages/salt-master-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:
@@ -105,7 +128,6 @@ platforms:
   - name: arch-base-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
   - name: gentoo-stage3-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:gentoo-stage3-latest
@@ -121,18 +143,26 @@ platforms:
       image: saltimages/salt-master-py3:rockylinux-8
 
   ## SALT `3003.1`
+  - name: debian-11-3003-1-py3
+    driver:
+      image: saltimages/salt-3003.1-py3:debian-11
+      run_command: /lib/systemd/systemd
   - name: debian-10-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-py3:debian-10
+      run_command: /lib/systemd/systemd
   - name: debian-9-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-py3:debian-9
+      run_command: /lib/systemd/systemd
   - name: ubuntu-2004-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
   - name: ubuntu-1804-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
   - name: centos-8-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-py3:centos-8
@@ -148,7 +178,6 @@ platforms:
   - name: opensuse-leap-153-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
-      run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
@@ -156,7 +185,6 @@ platforms:
   - name: opensuse-leap-152-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-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:
@@ -164,7 +192,6 @@ platforms:
   - name: opensuse-tmbl-latest-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-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:
@@ -181,7 +208,6 @@ platforms:
   - name: arch-base-latest-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-py3:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
   - name: gentoo-stage3-latest-3003-1-py3
     driver:
       image: saltimages/salt-3003.1-py3:gentoo-stage3-latest
@@ -191,18 +217,26 @@ platforms:
       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
+      run_command: /lib/systemd/systemd
   - name: debian-10-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:debian-10
+      run_command: /lib/systemd/systemd
   - name: debian-9-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:debian-9
+      run_command: /lib/systemd/systemd
   - name: ubuntu-2004-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
   - name: ubuntu-1804-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
   - name: centos-8-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:centos-8
@@ -227,7 +261,6 @@ platforms:
   - name: arch-base-latest-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
   - name: gentoo-stage3-latest-3002-6-py3
     driver:
       image: saltimages/salt-3002.6-py3:gentoo-stage3-latest
@@ -240,7 +273,6 @@ platforms:
   - name: opensuse-leap-153-3002-2-py3
     driver:
       image: saltimages/salt-3002.2-py3:opensuse-leap-15.3
-      run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
@@ -248,7 +280,6 @@ platforms:
   - name: opensuse-leap-152-3002-2-py3
     driver:
       image: saltimages/salt-3002.2-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:
@@ -256,7 +287,6 @@ platforms:
   - name: opensuse-tmbl-latest-3002-2-py3
     driver:
       image: saltimages/salt-3002.2-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:
@@ -266,15 +296,19 @@ platforms:
   - name: debian-10-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:debian-10
+      run_command: /lib/systemd/systemd
   - name: debian-9-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:debian-9
+      run_command: /lib/systemd/systemd
   - name: ubuntu-2004-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
   - name: ubuntu-1804-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
   - name: centos-8-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:centos-8
@@ -290,7 +324,6 @@ platforms:
   - name: opensuse-leap-153-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:opensuse-leap-15.3
-      run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
@@ -298,7 +331,6 @@ platforms:
   - 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:
@@ -306,7 +338,6 @@ platforms:
   - name: opensuse-tmbl-latest-3001-7-py3
     driver:
       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:
@@ -323,7 +354,6 @@ platforms:
   - name: arch-base-latest-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
   - name: gentoo-stage3-latest-3001-7-py3
     driver:
       image: saltimages/salt-3001.7-py3:gentoo-stage3-latest
@@ -336,12 +366,15 @@ platforms:
   - 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
@@ -351,7 +384,6 @@ platforms:
   - name: opensuse-leap-153-3000-9-py3
     driver:
       image: saltimages/salt-3000.9-py3:opensuse-leap-15.3
-      run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
@@ -359,7 +391,6 @@ platforms:
   - name: opensuse-leap-152-3000-9-py3
     driver:
       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:
@@ -383,27 +414,17 @@ platforms:
   - 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
     driver:
       image: saltimages/salt-3000.9-py2:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
-provisioner:
-  name: salt_solo
-  log_level: debug
-  salt_install: none
-  require_chef: false
-  formula: nginx
-  salt_copy_filter:
-    - .kitchen
-    - .git
 
 verifier:
   # https://www.inspec.io/
   name: inspec
   sudo: true
-  # cli, documentation, html, progress, json, json-min, json-rspec, junit
   reporter:
+    # cli, documentation, html, progress, json, json-min, json-rspec, junit
     - cli
 
 suites:
@@ -430,6 +451,7 @@ suites:
         - path: test/integration/default
   - name: passenger
     includes:
+      - debian-11-tiamat-py3
       - debian-10-tiamat-py3
       - debian-9-tiamat-py3
       - ubuntu-2004-tiamat-py3
@@ -439,6 +461,7 @@ suites:
       - oraclelinux-8-tiamat-py3
       - almalinux-8-tiamat-py3
       - rockylinux-8-tiamat-py3
+      - debian-11-master-py3
       - debian-10-master-py3
       - debian-9-master-py3
       - ubuntu-2004-master-py3
@@ -448,6 +471,7 @@ suites:
       - oraclelinux-8-master-py3
       - almalinux-8-master-py3
       - rockylinux-8-master-py3
+      - debian-11-3003-1-py3
       - debian-10-3003-1-py3
       - debian-9-3003-1-py3
       - ubuntu-2004-3003-1-py3
@@ -455,6 +479,7 @@ suites:
       - centos-8-3003-1-py3
       - centos-7-3003-1-py3
       - oraclelinux-8-3003-1-py3
+      - debian-11-3002-6-py3
       - debian-10-3002-6-py3
       - debian-9-3002-6-py3
       - ubuntu-2004-3002-6-py3
diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb
index 87daf08..af65449 100644
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@@ -49,7 +49,7 @@ class SystemResource < Inspec.resource(1)
   def build_platform_release
     case inspec.platform[:name]
     when 'amazon'
-      # `2018` relase is named `1` in kitchen.yaml
+      # `2018` relase is named `1` in `kitchen.yml`
       inspec.platform[:release].gsub(/2018.*/, '1')
     when 'arch'
       'base-latest'