diff --git a/.copier-answers.ssf-ci.yml b/.copier-answers.ssf-ci.yml
index 8a7152a..ef9f77f 100644
--- a/.copier-answers.ssf-ci.yml
+++ b/.copier-answers.ssf-ci.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v2.8.0
+_commit: v2.10.3
 _src_path: https://github.com/dafyddj/copier-ssf-ci
 failure_permitted_ignored: []
 failure_permitted_patterns: []
@@ -19,3 +19,4 @@ supported_oses:
 - Oracle Linux
 - Rocky Linux
 - Ubuntu
+test_using_gha: false
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f9e552a..b1ba07f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,20 +25,20 @@ jobs:
     name: Lint / `pre-commit`
     needs: should-run
     if: fromJSON(needs.should-run.outputs.should-run)
-    container: techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3
+    container: techneg/ci-pre-commit:v2.5.24@sha256:b206cbb9bf1506dec0e1b2a70c7e8d69850af75255a9d5d93d52dae54f636d3a
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       - run: | # Needed because of bug #2031 in `actions/checkout`
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           fetch-depth: 0
           fetch-tags: true
           filter: tree:0
       - name: Export `CI_CACHE_ID` from container
         run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
-      - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ~/.cache/pre-commit
           key: "${{ env.CI_CACHE_ID }}|\
@@ -61,13 +61,13 @@ jobs:
       issues: write
       pull-requests: write
       checks: read
-    container: techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27
+    container: techneg/ci-semantic-release:v1.2.22@sha256:091cbee13d24025ba940398995814c807d253933ce20a3b07563cc0d27bba147
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
       - run: |  # Needed due to bug actions/checkout#2031
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       # yamllint disable-line rule:line-length
       - uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
         with:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c23ed09..814f8fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,15 +15,15 @@
   stage_test: &stage_test 'test'
   # `image`
   # yamllint disable rule:line-length
-  image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.103@sha256:3a2bf514e461769ed7b8880213e9637186bb7e17e0653b4a6ad3f249e4a60d33'
-  image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76'
-  image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76'
-  image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3'
-  image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
-  image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27'
+  image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.121@sha256:cc78c38059137aee4b93e6b577391cc9f36d306689279b0fd903c1bbbd331a20'
+  image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.91@sha256:d3664d2db1ca266e1f3ded4ffe8afb3fe1b7690f08d28e6cd941ead157cf37a5'
+  image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.91@sha256:d3664d2db1ca266e1f3ded4ffe8afb3fe1b7690f08d28e6cd941ead157cf37a5'
+  image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.24@sha256:b206cbb9bf1506dec0e1b2a70c7e8d69850af75255a9d5d93d52dae54f636d3a'
+  image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:74850471782195453cdf91f4a5edf62b6fcc3365c124d4d975c7e87a702040d7'
+  image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.22@sha256:091cbee13d24025ba940398995814c807d253933ce20a3b07563cc0d27bba147'
   # `services`
   services_docker_dind: &services_docker_dind
-    - 'docker:28.3.3-dind@sha256:a56b3bdde89315ed2cc0e4906e582b5033d93bf20d9cb9510c2cdd4e7f7690b1'
+    - 'docker:29.1.3-dind@sha256:173f284a4299164772a90f52b373e73e087583c0963f1334c9995f190ef6f3f5'
   # yamllint enable rule:line-length
   # `variables`
   # https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -135,8 +135,8 @@ rubocop:
     policy: 'pull'
   before_script: *bundle_install
   script:
-    # Alternative value to consider: `${CI_JOB_NAME}`
-    - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'
+    - 'echo "Starting test job: ${CI_JOB_NAME}"'
+    - 'bin/kitchen verify "${CI_JOB_NAME}"'
 
 ###############################################################################
 # Define `test` template (`allow_failure: true`)
@@ -175,42 +175,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
 ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
 ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
 ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
-almalinux-9-3007-7: {extends: '.test_instance'}
-almalinux-8-3007-7: {extends: '.test_instance'}
-amazonlinux-2023-3007-7: {extends: '.test_instance'}
-amazonlinux-2-3007-7: {extends: '.test_instance_failure_permitted'}
-centos-stream9-3007-7: {extends: '.test_instance'}
-debian-12-3007-7: {extends: '.test_instance'}
-debian-11-3007-7: {extends: '.test_instance'}
-fedora-41-3007-7: {extends: '.test_instance_failure_permitted'}
-fedora-40-3007-7: {extends: '.test_instance'}
-opensuse-leap-156-3007-7: {extends: '.test_instance'}
-opensuse-tmbl-latest-3007-7: {extends: '.test_instance'}
-oraclelinux-9-3007-7: {extends: '.test_instance'}
-oraclelinux-8-3007-7: {extends: '.test_instance'}
-rockylinux-9-3007-7: {extends: '.test_instance'}
-rockylinux-8-3007-7: {extends: '.test_instance'}
-ubuntu-2404-3007-7: {extends: '.test_instance'}
-ubuntu-2204-3007-7: {extends: '.test_instance'}
-ubuntu-2004-3007-7: {extends: '.test_instance'}
-almalinux-9-3006-15: {extends: '.test_instance'}
-almalinux-8-3006-15: {extends: '.test_instance'}
-amazonlinux-2023-3006-15: {extends: '.test_instance'}
-amazonlinux-2-3006-15: {extends: '.test_instance_failure_permitted'}
-centos-stream9-3006-15: {extends: '.test_instance'}
-debian-12-3006-15: {extends: '.test_instance'}
-debian-11-3006-15: {extends: '.test_instance'}
-fedora-41-3006-15: {extends: '.test_instance_failure_permitted'}
-fedora-40-3006-15: {extends: '.test_instance'}
-opensuse-leap-156-3006-15: {extends: '.test_instance'}
-opensuse-tmbl-latest-3006-15: {extends: '.test_instance'}
-oraclelinux-9-3006-15: {extends: '.test_instance'}
-oraclelinux-8-3006-15: {extends: '.test_instance'}
-rockylinux-9-3006-15: {extends: '.test_instance'}
-rockylinux-8-3006-15: {extends: '.test_instance'}
-ubuntu-2404-3006-15: {extends: '.test_instance'}
-ubuntu-2204-3006-15: {extends: '.test_instance'}
-ubuntu-2004-3006-15: {extends: '.test_instance'}
+almalinux-9-3007: {extends: '.test_instance'}
+almalinux-8-3007: {extends: '.test_instance'}
+amazonlinux-2023-3007: {extends: '.test_instance'}
+amazonlinux-2-3007: {extends: '.test_instance_failure_permitted'}
+centos-stream9-3007: {extends: '.test_instance'}
+debian-12-3007: {extends: '.test_instance'}
+debian-11-3007: {extends: '.test_instance'}
+fedora-41-3007: {extends: '.test_instance_failure_permitted'}
+fedora-40-3007: {extends: '.test_instance'}
+opensuse-leap-156-3007: {extends: '.test_instance'}
+opensuse-tmbl-latest-3007: {extends: '.test_instance'}
+oraclelinux-9-3007: {extends: '.test_instance'}
+oraclelinux-8-3007: {extends: '.test_instance'}
+rockylinux-9-3007: {extends: '.test_instance'}
+rockylinux-8-3007: {extends: '.test_instance'}
+ubuntu-2404-3007: {extends: '.test_instance'}
+ubuntu-2204-3007: {extends: '.test_instance'}
+ubuntu-2004-3007: {extends: '.test_instance'}
+almalinux-9-3006: {extends: '.test_instance'}
+almalinux-8-3006: {extends: '.test_instance'}
+amazonlinux-2023-3006: {extends: '.test_instance'}
+amazonlinux-2-3006: {extends: '.test_instance_failure_permitted'}
+centos-stream9-3006: {extends: '.test_instance'}
+debian-12-3006: {extends: '.test_instance'}
+debian-11-3006: {extends: '.test_instance'}
+fedora-41-3006: {extends: '.test_instance_failure_permitted'}
+fedora-40-3006: {extends: '.test_instance'}
+opensuse-leap-156-3006: {extends: '.test_instance'}
+opensuse-tmbl-latest-3006: {extends: '.test_instance'}
+oraclelinux-9-3006: {extends: '.test_instance'}
+oraclelinux-8-3006: {extends: '.test_instance'}
+rockylinux-9-3006: {extends: '.test_instance'}
+rockylinux-8-3006: {extends: '.test_instance'}
+ubuntu-2404-3006: {extends: '.test_instance'}
+ubuntu-2204-3006: {extends: '.test_instance'}
+ubuntu-2004-3006: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a3a1b74..b4cb766 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -30,7 +30,7 @@ repos:
       - id: commitlint
       - id: commitlint-ci
   - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.80.1
+    rev: v1.82.1
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
@@ -100,12 +100,12 @@ repos:
             )$
         additional_dependencies: [pygments==2.16.1]
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 41.93.2
+    rev: 42.71.2
     hooks:
       - id: renovate-config-validator
         name: Check Renovate config with renovate-config-validator
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.3
+    rev: 0.36.0
     hooks:
       - id: check-github-workflows
         name: Check GitHub workflows with check-jsonschema
diff --git a/Gemfile b/Gemfile
index 4d608b1..d960687 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
 # improvement: avoid package installations which are already covered by the
 # `salt-image-builder` (i.e. the pre-salted images that we're using)
 # rubocop:disable Layout/LineLength
-gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
+gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker', ref: '511e4ad36856b9e2eccceb56603586e6cebd296a'
 # rubocop:enable Layout/LineLength
 
 gem 'kitchen-inspec', '3.0.0'
@@ -21,4 +21,4 @@ gem 'kitchen-salt', '0.7.2'
 # Avoid the error 'pkeys are immutable on OpenSSL 3.0'
 gem 'net-ssh', '>= 7.0.0'
 
-gem 'test-kitchen', '3.7.0'
+gem 'test-kitchen', '3.9.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index f5fb7b3..8c606d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/test-kitchen/kitchen-docker
+  revision: 511e4ad36856b9e2eccceb56603586e6cebd296a
+  ref: 511e4ad36856b9e2eccceb56603586e6cebd296a
+  specs:
+    kitchen-docker (3.0.0)
+      test-kitchen (>= 1.0.0, < 4.0)
+
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
   revision: a0c6295303f7d7a4d2a6164b5e77868560b04945
@@ -40,14 +48,6 @@ GIT
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
 
-GIT
-  remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 104079a1d2fe34f5b076f4d316f6f837fa76e412
-  branch: ssf
-  specs:
-    kitchen-docker (2.13.0)
-      test-kitchen (>= 1.0.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -67,19 +67,16 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.3)
-    aws-eventstream (1.3.2)
-    aws-partitions (1.863.0)
-    aws-sdk-accessanalyzer (1.44.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
-      aws-sigv4 (~> 1.1)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1196.0)
     aws-sdk-account (1.20.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-alexaforbusiness (1.67.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-amplify (1.54.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-amplify (1.32.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-apigateway (1.90.0)
       aws-sdk-core (~> 3, >= 3.188.0)
@@ -87,17 +84,17 @@ GEM
     aws-sdk-apigatewayv2 (1.53.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-applicationautoscaling (1.79.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-applicationautoscaling (1.51.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-athena (1.79.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.102.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-autoscaling (1.92.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-batch (1.79.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-batch (1.73.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-budgets (1.62.0)
       aws-sdk-core (~> 3, >= 3.188.0)
@@ -120,8 +117,8 @@ GEM
     aws-sdk-cloudwatch (1.83.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchevents (1.69.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-cloudwatchevents (1.62.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudwatchlogs (1.77.0)
       aws-sdk-core (~> 3, >= 3.188.0)
@@ -135,25 +132,28 @@ GEM
     aws-sdk-codepipeline (1.67.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cognitoidentity (1.51.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-cognitoidentity (1.45.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cognitoidentityprovider (1.85.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-cognitoidentityprovider (1.76.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-configservice (1.103.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.190.3)
+    aws-sdk-core (3.240.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
+      logger
     aws-sdk-costandusagereportservice (1.53.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-databasemigrationservice (1.91.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-databasemigrationservice (1.80.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-dynamodb (1.98.0)
       aws-sdk-core (~> 3, >= 3.188.0)
@@ -191,17 +191,17 @@ GEM
     aws-sdk-elasticsearchservice (1.79.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-emr (1.81.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-emr (1.53.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eventbridge (1.54.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-eventbridge (1.46.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-firehose (1.60.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-glue (1.165.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-glue (1.145.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-guardduty (1.85.0)
       aws-sdk-core (~> 3, >= 3.188.0)
@@ -215,17 +215,14 @@ GEM
     aws-sdk-kinesis (1.54.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.76.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
-      aws-sigv4 (~> 1.1)
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
+      aws-sigv4 (~> 1.5)
     aws-sdk-lambda (1.113.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-macie2 (1.64.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-mq (1.58.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-mq (1.40.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-networkfirewall (1.39.0)
       aws-sdk-core (~> 3, >= 3.188.0)
@@ -233,11 +230,11 @@ GEM
     aws-sdk-networkmanager (1.40.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-organizations (1.83.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-organizations (1.77.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ram (1.52.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-ram (1.26.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-rds (1.208.0)
       aws-sdk-core (~> 3, >= 3.188.0)
@@ -254,33 +251,33 @@ GEM
     aws-sdk-route53resolver (1.51.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.141.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-s3 (1.208.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sdk-s3control (1.74.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3control (1.43.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-secretsmanager (1.87.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-secretsmanager (1.46.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-securityhub (1.98.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-servicecatalog (1.90.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-servicecatalog (1.60.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ses (1.58.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-ses (1.41.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-shield (1.60.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-signer (1.50.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-signer (1.32.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-simpledb (1.42.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-simpledb (1.29.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv2 (~> 1.0)
     aws-sdk-sms (1.52.0)
       aws-sdk-core (~> 3, >= 3.188.0)
@@ -294,23 +291,20 @@ GEM
     aws-sdk-ssm (1.162.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-states (1.63.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-states (1.39.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-synthetics (1.39.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-synthetics (1.19.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-transfer (1.86.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-transfer (1.73.0)
+      aws-sdk-core (~> 3, >= 3.176.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-waf (1.58.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-wafv2 (1.74.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-waf (1.43.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
     aws-sigv2 (1.2.0)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     azure_graph_rbac (0.17.2)
       ms_rest_azure (~> 0.12.0)
@@ -322,13 +316,14 @@ GEM
       ms_rest_azure (~> 0.12.0)
     azure_mgmt_storage (0.23.0)
       ms_rest_azure (~> 0.12.0)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcrypt_pbkdf (1.1.1)
     bcrypt_pbkdf (1.1.1-x64-mingw-ucrt)
     benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.3.1)
     bson (4.15.0)
     builder (3.3.0)
+    cgi (0.5.0)
     chef-config (18.7.6)
       addressable
       chef-utils (= 18.7.6)
@@ -369,6 +364,8 @@ GEM
     connection_pool (2.5.3)
     cookstyle (8.1.2)
       rubocop (= 1.75.5)
+    csv (3.3.5)
+    date (3.5.0)
     declarative (0.0.20)
     diff-lcs (1.6.2)
     docker-api (2.4.0)
@@ -377,6 +374,8 @@ GEM
     domain_name (0.6.20240107)
     drb (2.2.1)
     ed25519 (1.4.0)
+    erb (4.0.4)
+      cgi (>= 0.3.3)
     erubi (1.13.1)
     excon (1.2.5)
       logger
@@ -459,6 +458,10 @@ GEM
       concurrent-ruby (~> 1.0)
     inifile (3.0.0)
     io-console (0.8.0)
+    irb (1.15.3)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     jmespath (1.6.2)
     json (2.12.0)
     jwt (2.10.1)
@@ -513,7 +516,7 @@ GEM
       faraday (>= 0.9, < 2.0.0)
       faraday-cookie_jar (~> 0.0.6)
       ms_rest (~> 0.7.6)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     net-scp (4.1.0)
@@ -530,6 +533,7 @@ GEM
       bigdecimal
     options (2.3.2)
     os (1.1.4)
+    ostruct (0.6.3)
     parallel (1.27.0)
     parser (3.3.8.0)
       ast (~> 2.4.1)
@@ -537,6 +541,9 @@ GEM
     parslet (1.8.2)
     pastel (0.8.0)
       tty-color (~> 0.5)
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
     prism (1.4.0)
     progress_bar (1.3.4)
       highline (>= 1.6)
@@ -544,10 +551,17 @@ GEM
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    psych (5.2.6)
+      date
+      stringio
     public_suffix (6.0.2)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
+    rdoc (6.16.1)
+      erb
+      psych (>= 4.0.0)
+      tsort
     regexp_parser (2.10.0)
     reline (0.6.1)
       io-console (~> 0.5)
@@ -556,7 +570,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.1)
+    rexml (3.4.4)
     roo (2.9.0)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
@@ -612,21 +626,28 @@ GEM
       logger
       ruby-ole
     sslshake (1.3.1)
+    stringio (3.1.8)
     strings (0.2.1)
       strings-ansi (~> 0.2)
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    test-kitchen (3.7.0)
+    syslog (0.3.0)
+      logger
+    test-kitchen (3.9.0)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
-      ed25519 (~> 1.2)
+      csv (~> 3.3)
+      ed25519 (~> 1.3)
+      irb (~> 1.15)
       license-acceptance (>= 1.0.11, < 3.0)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 4.0)
       net-scp (>= 1.1, < 5.0)
       net-ssh (>= 2.9, < 8.0)
       net-ssh-gateway (>= 1.2, < 3.0)
+      ostruct (~> 0.6)
+      syslog (~> 0.3)
       thor (>= 0.19, < 2.0)
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
@@ -654,87 +675,83 @@ GEM
       inifile (~> 3.0)
       train-core (= 3.12.13)
       train-winrm (~> 0.2.19)
-    train-aws (0.2.41)
-      aws-partitions (~> 1.863.0)
-      aws-sdk-accessanalyzer (~> 1.44.0)
-      aws-sdk-account (~> 1.20.0)
-      aws-sdk-alexaforbusiness (~> 1.67.0)
-      aws-sdk-amplify (~> 1.54.0)
-      aws-sdk-apigateway (~> 1.90.0)
-      aws-sdk-apigatewayv2 (~> 1.53.0)
-      aws-sdk-applicationautoscaling (~> 1.79.0)
-      aws-sdk-athena (>= 1.78, < 1.80)
-      aws-sdk-autoscaling (= 1.102.0)
-      aws-sdk-batch (~> 1.79.0)
-      aws-sdk-budgets (~> 1.62.0)
-      aws-sdk-cloudformation (>= 1.96, < 1.98)
-      aws-sdk-cloudfront (~> 1.86.0)
-      aws-sdk-cloudhsm (~> 1.50.0)
-      aws-sdk-cloudhsmv2 (~> 1.53.0)
-      aws-sdk-cloudtrail (~> 1.74.0)
-      aws-sdk-cloudwatch (~> 1.83.0)
-      aws-sdk-cloudwatchevents (~> 1.69.0)
-      aws-sdk-cloudwatchlogs (~> 1.75)
-      aws-sdk-codecommit (~> 1.62.0)
-      aws-sdk-codedeploy (~> 1.62.0)
-      aws-sdk-codepipeline (~> 1.67.0)
-      aws-sdk-cognitoidentity (~> 1.51.0)
-      aws-sdk-cognitoidentityprovider (~> 1.84)
-      aws-sdk-configservice (~> 1.103.0)
-      aws-sdk-core (~> 3.190.0)
-      aws-sdk-costandusagereportservice (~> 1.53.0)
-      aws-sdk-databasemigrationservice (~> 1.91.0)
-      aws-sdk-dynamodb (~> 1.98.0)
-      aws-sdk-ec2 (>= 1.427, < 1.430)
-      aws-sdk-ecr (~> 1.68.0)
-      aws-sdk-ecrpublic (~> 1.25.0)
-      aws-sdk-ecs (~> 1.135.0)
-      aws-sdk-efs (~> 1.71.0)
-      aws-sdk-eks (~> 1.95.0)
-      aws-sdk-elasticache (~> 1.95.0)
-      aws-sdk-elasticbeanstalk (~> 1.63.0)
-      aws-sdk-elasticloadbalancing (~> 1.51.0)
-      aws-sdk-elasticloadbalancingv2 (~> 1.96.0)
-      aws-sdk-elasticsearchservice (~> 1.79.0)
-      aws-sdk-emr (~> 1.81.0)
-      aws-sdk-eventbridge (~> 1.54.0)
-      aws-sdk-firehose (~> 1.60.0)
-      aws-sdk-glue (~> 1.164)
-      aws-sdk-guardduty (~> 1.85.0)
-      aws-sdk-iam (~> 1.92.0)
-      aws-sdk-kafka (~> 1.67.0)
-      aws-sdk-kinesis (~> 1.54.0)
-      aws-sdk-kms (~> 1.74)
-      aws-sdk-lambda (~> 1.113.0)
-      aws-sdk-macie2 (~> 1.64.0)
-      aws-sdk-mq (~> 1.58.0)
-      aws-sdk-networkfirewall (~> 1.39.0)
-      aws-sdk-networkmanager (~> 1.40.0)
-      aws-sdk-organizations (~> 1.83.0)
-      aws-sdk-ram (~> 1.52.0)
-      aws-sdk-rds (~> 1.208.0)
-      aws-sdk-redshift (~> 1.107.0)
-      aws-sdk-route53 (~> 1.83.0)
-      aws-sdk-route53domains (~> 1.54.0)
-      aws-sdk-route53resolver (~> 1.51.0)
-      aws-sdk-s3 (~> 1.141.0)
-      aws-sdk-s3control (~> 1.74.0)
-      aws-sdk-secretsmanager (~> 1.87.0)
-      aws-sdk-securityhub (~> 1.98.0)
-      aws-sdk-servicecatalog (~> 1.90.0)
-      aws-sdk-ses (~> 1.58.0)
-      aws-sdk-shield (~> 1.60.0)
-      aws-sdk-signer (~> 1.50.0)
-      aws-sdk-simpledb (~> 1.42.0)
-      aws-sdk-sms (~> 1.52.0)
-      aws-sdk-sns (~> 1.70.0)
-      aws-sdk-sqs (~> 1.69.0)
-      aws-sdk-ssm (~> 1.162.0)
-      aws-sdk-states (~> 1.63.0)
-      aws-sdk-synthetics (~> 1.39.0)
-      aws-sdk-transfer (~> 1.86.0)
-      aws-sdk-waf (~> 1.58.0)
-      aws-sdk-wafv2 (~> 1.74.0)
+    train-aws (0.2.36)
+      aws-sdk-account (~> 1.14)
+      aws-sdk-alexaforbusiness (~> 1.0)
+      aws-sdk-amplify (~> 1.32.0)
+      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, < 1.93)
+      aws-sdk-batch (>= 1.36, < 1.74)
+      aws-sdk-budgets (~> 1.0)
+      aws-sdk-cloudformation (~> 1.0)
+      aws-sdk-cloudfront (~> 1.0)
+      aws-sdk-cloudhsm (~> 1.0)
+      aws-sdk-cloudhsmv2 (~> 1.0)
+      aws-sdk-cloudtrail (~> 1.8)
+      aws-sdk-cloudwatch (~> 1.13)
+      aws-sdk-cloudwatchevents (>= 1.36, < 1.63)
+      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.46)
+      aws-sdk-cognitoidentityprovider (>= 1.46, < 1.77)
+      aws-sdk-configservice (~> 1.21)
+      aws-sdk-core (~> 3.0)
+      aws-sdk-costandusagereportservice (~> 1.6)
+      aws-sdk-databasemigrationservice (>= 1.42, < 1.81)
+      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)
+      aws-sdk-elasticache (~> 1.0)
+      aws-sdk-elasticbeanstalk (~> 1.0)
+      aws-sdk-elasticloadbalancing (~> 1.8)
+      aws-sdk-elasticloadbalancingv2 (~> 1.0)
+      aws-sdk-elasticsearchservice (~> 1.0)
+      aws-sdk-emr (~> 1.53.0)
+      aws-sdk-eventbridge (>= 1.24, < 1.47)
+      aws-sdk-firehose (~> 1.0)
+      aws-sdk-glue (>= 1.71, < 1.146)
+      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-mq (~> 1.40.0)
+      aws-sdk-networkfirewall (>= 1.6.0)
+      aws-sdk-networkmanager (>= 1.13.0)
+      aws-sdk-organizations (>= 1.17, < 1.78)
+      aws-sdk-ram (>= 1.21, < 1.27)
+      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-s3control (~> 1.43.0)
+      aws-sdk-secretsmanager (>= 1.42, < 1.47)
+      aws-sdk-securityhub (~> 1.0)
+      aws-sdk-servicecatalog (>= 1.48, < 1.61)
+      aws-sdk-ses (~> 1.41.0)
+      aws-sdk-shield (~> 1.30)
+      aws-sdk-signer (~> 1.32.0)
+      aws-sdk-simpledb (~> 1.29.0)
+      aws-sdk-sms (~> 1.0)
+      aws-sdk-sns (~> 1.9)
+      aws-sdk-sqs (~> 1.10)
+      aws-sdk-ssm (~> 1.0)
+      aws-sdk-states (>= 1.35, < 1.40)
+      aws-sdk-synthetics (~> 1.19.0)
+      aws-sdk-transfer (>= 1.26, < 1.74)
+      aws-sdk-waf (~> 1.43.0)
     train-core (3.12.13)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
@@ -747,6 +764,7 @@ GEM
       chef-winrm (~> 2.3.12)
       chef-winrm-elevated (~> 1.2.5)
       chef-winrm-fs (~> 1.3.7)
+    tsort (0.2.0)
     tty-box (0.7.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
@@ -804,7 +822,7 @@ DEPENDENCIES
   kitchen-inspec (= 3.0.0)
   kitchen-salt (= 0.7.2)
   net-ssh (>= 7.0.0)
-  test-kitchen (= 3.7.0)
+  test-kitchen (= 3.9.0)
 
 BUNDLED WITH
    2.3.7
diff --git a/kitchen.yml b/kitchen.yml
index f353991..aadbbf3 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -91,143 +91,143 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:rockylinux-8
 
-  ## SALT `3007.7`
-  - name: debian-12-3007-7
+  ## SALT `3007.9`
+  - name: debian-12-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:debian-12
+      image: saltimages/salt-3007.9-py3:debian-12
       run_command: /lib/systemd/systemd
-  - name: debian-11-3007-7
+  - name: debian-11-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:debian-11
+      image: saltimages/salt-3007.9-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2404-3007-7
+  - name: ubuntu-2404-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:ubuntu-24.04
+      image: saltimages/salt-3007.9-py3:ubuntu-24.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-3007-7
+  - name: ubuntu-2204-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:ubuntu-22.04
+      image: saltimages/salt-3007.9-py3:ubuntu-22.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3007-7
+  - name: ubuntu-2004-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:ubuntu-20.04
+      image: saltimages/salt-3007.9-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: centos-stream9-3007-7
+  - name: centos-stream9-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:centos-stream9
-  - name: opensuse-leap-156-3007-7
+      image: saltimages/salt-3007.9-py3:centos-stream9
+  - name: opensuse-leap-156-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:opensuse-leap-15.6
+      image: saltimages/salt-3007.9-py3:opensuse-leap-15.6
     # Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3007-7
+  - name: opensuse-tmbl-latest-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3007.9-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: fedora-41-3007-7
+  - name: fedora-41-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:fedora-41
-  - name: fedora-40-3007-7
+      image: saltimages/salt-3007.9-py3:fedora-41
+  - name: fedora-40-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:fedora-40
-  - name: amazonlinux-2023-3007-7
+      image: saltimages/salt-3007.9-py3:fedora-40
+  - name: amazonlinux-2023-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:amazonlinux-2023
-  - name: amazonlinux-2-3007-7
+      image: saltimages/salt-3007.9-py3:amazonlinux-2023
+  - name: amazonlinux-2-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:amazonlinux-2
-  - name: oraclelinux-9-3007-7
+      image: saltimages/salt-3007.9-py3:amazonlinux-2
+  - name: oraclelinux-9-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:oraclelinux-9
-  - name: oraclelinux-8-3007-7
+      image: saltimages/salt-3007.9-py3:oraclelinux-9
+  - name: oraclelinux-8-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:oraclelinux-8
-  - name: almalinux-9-3007-7
+      image: saltimages/salt-3007.9-py3:oraclelinux-8
+  - name: almalinux-9-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:almalinux-9
-  - name: almalinux-8-3007-7
+      image: saltimages/salt-3007.9-py3:almalinux-9
+  - name: almalinux-8-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:almalinux-8
-  - name: rockylinux-9-3007-7
+      image: saltimages/salt-3007.9-py3:almalinux-8
+  - name: rockylinux-9-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:rockylinux-9
-  - name: rockylinux-8-3007-7
+      image: saltimages/salt-3007.9-py3:rockylinux-9
+  - name: rockylinux-8-3007-9
     driver:
-      image: saltimages/salt-3007.7-py3:rockylinux-8
+      image: saltimages/salt-3007.9-py3:rockylinux-8
 
-  ## SALT `3006.15`
-  - name: debian-12-3006-15
+  ## SALT `3006.17`
+  - name: debian-12-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:debian-12
+      image: saltimages/salt-3006.17-py3:debian-12
       run_command: /lib/systemd/systemd
-  - name: debian-11-3006-15
+  - name: debian-11-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:debian-11
+      image: saltimages/salt-3006.17-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2404-3006-15
+  - name: ubuntu-2404-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:ubuntu-24.04
+      image: saltimages/salt-3006.17-py3:ubuntu-24.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-3006-15
+  - name: ubuntu-2204-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:ubuntu-22.04
+      image: saltimages/salt-3006.17-py3:ubuntu-22.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3006-15
+  - name: ubuntu-2004-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:ubuntu-20.04
+      image: saltimages/salt-3006.17-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: centos-stream9-3006-15
+  - name: centos-stream9-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:centos-stream9
-  - name: opensuse-tmbl-latest-3006-15
+      image: saltimages/salt-3006.17-py3:centos-stream9
+  - name: opensuse-tmbl-latest-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3006.17-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: opensuse-leap-156-3006-15
+  - name: opensuse-leap-156-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:opensuse-leap-15.6
+      image: saltimages/salt-3006.17-py3:opensuse-leap-15.6
     # Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: fedora-41-3006-15
+  - name: fedora-41-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:fedora-41
-  - name: fedora-40-3006-15
+      image: saltimages/salt-3006.17-py3:fedora-41
+  - name: fedora-40-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:fedora-40
-  - name: amazonlinux-2023-3006-15
+      image: saltimages/salt-3006.17-py3:fedora-40
+  - name: amazonlinux-2023-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:amazonlinux-2023
-  - name: amazonlinux-2-3006-15
+      image: saltimages/salt-3006.17-py3:amazonlinux-2023
+  - name: amazonlinux-2-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:amazonlinux-2
-  - name: oraclelinux-9-3006-15
+      image: saltimages/salt-3006.17-py3:amazonlinux-2
+  - name: oraclelinux-9-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:oraclelinux-9
-  - name: oraclelinux-8-3006-15
+      image: saltimages/salt-3006.17-py3:oraclelinux-9
+  - name: oraclelinux-8-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:oraclelinux-8
-  - name: almalinux-9-3006-15
+      image: saltimages/salt-3006.17-py3:oraclelinux-8
+  - name: almalinux-9-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:almalinux-9
-  - name: almalinux-8-3006-15
+      image: saltimages/salt-3006.17-py3:almalinux-9
+  - name: almalinux-8-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:almalinux-8
-  - name: rockylinux-9-3006-15
+      image: saltimages/salt-3006.17-py3:almalinux-8
+  - name: rockylinux-9-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:rockylinux-9
-  - name: rockylinux-8-3006-15
+      image: saltimages/salt-3006.17-py3:rockylinux-9
+  - name: rockylinux-8-3006-17
     driver:
-      image: saltimages/salt-3006.15-py3:rockylinux-8
+      image: saltimages/salt-3006.17-py3:rockylinux-8
 
 ##########################################################
 # This file is managed as part of a Copier template.     #
diff --git a/release-rules.js b/release-rules.js
deleted file mode 100644
index 1093d1f..0000000
--- a/release-rules.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// No release is triggered for the types commented out below.
-// Commits using these types will be incorporated into the next release.
-//
-// NOTE: Any changes here must be reflected in `CONTRIBUTING.md`.
-module.exports = [
-  { breaking: true, release: 'major' },
-  // {type: 'build', release: 'patch'},
-  // {type: 'chore', release: 'patch'},
-  // {type: 'ci', release: 'patch'},
-  { type: 'docs', release: 'patch' },
-  { type: 'feat', release: 'minor' },
-  { type: 'fix', release: 'patch' },
-  { type: 'perf', release: 'patch' },
-  { type: 'refactor', release: 'patch' },
-  { type: 'revert', release: 'patch' },
-  { type: 'style', release: 'patch' },
-  { type: 'test', release: 'patch' }
-]
diff --git a/release.config.js b/release.config.js
index 0d85d56..73a50ae 100644
--- a/release.config.js
+++ b/release.config.js
@@ -1,11 +1,36 @@
-module.exports = {
+// Commit types appear in the changelog in this order
+const commitTypes = [
+  { type: 'feat', section: 'Features' },
+  { type: 'fix', section: 'Bug Fixes' },
+  { type: 'perf', section: 'Performance Improvements' },
+  { type: 'revert', section: 'Reversions' },
+  { type: 'refactor', section: 'Code Refactoring' },
+  { type: 'docs', section: 'Documentation' },
+  { type: 'test', section: 'Testing' },
+  { type: 'style', section: 'Style Changes' },
+  { type: 'ci', section: 'Continuous Integration' },
+  { type: 'build', section: 'Build System' },
+  { type: 'chore', section: 'Maintenance' }
+]
+
+// Default rules can be found in `github.com/semantic-release/commit-analyzer/lib/default-release-rules.js`
+// that cover feat, fix, perf and breaking.
+// Commit types defined above but without release rules do not trigger a release
+// but will be incorporated into the next release.
+// NOTE: Any changes to commit types or release rules must be reflected in `CONTRIBUTING.rst`.
+const releaseRules = [
+  { type: 'docs', release: 'patch' },
+  { type: 'refactor', release: 'patch' },
+  { type: 'revert', release: 'patch' },
+  { type: 'style', release: 'patch' },
+  { type: 'test', release: 'patch' }
+]
+
+const config = {
   // TODO: remove this when we no longer process releases on GitLab CI
   repositoryUrl: 'https://github.com/saltstack-formulas/salt-formula',
   plugins: [
-    ['@semantic-release/commit-analyzer', {
-      preset: 'angular',
-      releaseRules: './release-rules.js'
-    }],
+    ['@semantic-release/commit-analyzer', { releaseRules }],
     '@semantic-release/release-notes-generator',
     ['@semantic-release/changelog', {
       changelogFile: 'CHANGELOG.md',
@@ -20,7 +45,10 @@ module.exports = {
     }],
     '@semantic-release/github'
   ],
-  generateNotes: {
-    preset: 'angular'
+  preset: 'conventionalcommits',
+  presetConfig: {
+    types: commitTypes
   }
 }
+
+module.exports = config