diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index daceb64..6aaa603 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -131,29 +131,19 @@ You can install all needed gems for spec tests into the modules directory by
 running:
 
 ```sh
-bundle config set --local path '.vendor/'
-bundle config set --local without 'development system_tests release'
-bundle install --jobs "$(nproc)"
+bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
 ```
 
 If you also want to run acceptance tests:
 
 ```sh
-bundle config set --local path '.vendor/'
-bundle config set --local without 'development release'
-bundle config set --local with 'system_tests'
-bundle install --jobs "$(nproc)"
+bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
 ```
 
 Our all in one solution if you don't know if you need to install or update gems:
 
 ```sh
-bundle config set --local path '.vendor/'
-bundle config set --local without 'development release'
-bundle config set --local with 'system_tests'
-bundle install --jobs "$(nproc)"
-bundle update
-bundle clean
+bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
 ```
 
 As an alternative to the `--jobs "$(nproc)` parameter, you can set an
@@ -245,23 +235,15 @@ with:
 BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
 ```
 
-or
-
-```sh
-BEAKER_PUPPET_COLLECTION=none BEAKER_setfile=archlinux-64 bundle exec rake beaker
-```
-
-This latter example will use the distribution's own version of Puppet.
-
 You can replace the string `debian11` with any common operating system.
 The following strings are known to work:
 
 * ubuntu2004
 * ubuntu2204
 * debian11
-* debian12
+* centos7
+* centos8
 * centos9
-* archlinux
 * almalinux8
 * almalinux9
 * fedora36
diff --git a/.github/release.yml b/.github/release.yml
deleted file mode 100644
index f5b5d7a..0000000
--- a/.github/release.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-# Managed by modulesync - DO NOT EDIT
-# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
-
-# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
-
-changelog:
-  exclude:
-    labels:
-      - duplicate
-      - invalid
-      - modulesync
-      - question
-      - skip-changelog
-      - wont-fix
-      - wontfix
-
-  categories:
-    - title: Breaking Changes 🛠
-      labels:
-        - backwards-incompatible
-
-    - title: New Features 🎉
-      labels:
-        - enhancement
-
-    - title: Bug Fixes 🐛
-      labels:
-        - bug
-
-    - title: Documentation Updates 📚
-      labels:
-        - documentation
-        - docs
-
-    - title: Dependency Updates ⬆️
-      labels:
-        - dependencies
-
-    - title: Other Changes
-      labels:
-        - "*"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c32acf..7216724 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,6 @@
 
 name: CI
 
-# yamllint disable-line rule:truthy
 on:
   pull_request: {}
   push:
@@ -19,4 +18,6 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
+    with:
+      pidfile_workaround: 'false'
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
deleted file mode 100644
index 73be88d..0000000
--- a/.github/workflows/labeler.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# Managed by modulesync - DO NOT EDIT
-# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
-
-name: "Pull Request Labeler"
-
-# yamllint disable-line rule:truthy
-on:
-  pull_request_target: {}
-
-jobs:
-  labeler:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/labeler@v5
diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml
deleted file mode 100644
index 01efa1a..0000000
--- a/.github/workflows/prepare_release.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# Managed by modulesync - DO NOT EDIT
-# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
-
-name: 'Prepare Release'
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)'
-        required: false
-
-jobs:
-  release_prep:
-    uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
-    with:
-      version: ${{ github.event.inputs.version }}
-      allowed_owner: 'voxpupuli'
-    secrets:
-      # Configure secrets here:
-      #  https://docs.github.com/en/actions/security-guides/encrypted-secrets
-      github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3db60fb..55324aa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,7 +4,6 @@
 
 name: Release
 
-# yamllint disable-line rule:truthy
 on:
   push:
     tags:
@@ -13,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
     with:
       allowed_owner: 'voxpupuli'
     secrets:
diff --git a/.gitignore b/.gitignore
index adea1b0..84fd904 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,3 @@
 .*.sw?
 /.yardoc/
 /Guardfile
-bolt-debug.log
-.rerun.json
diff --git a/.msync.yml b/.msync.yml
index b86acb8..f46ee02 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '9.7.0'
+modulesync_config_version: '7.3.0'
diff --git a/.overcommit.yml b/.overcommit.yml
index 4ed994c..d367ada 100644
--- a/.overcommit.yml
+++ b/.overcommit.yml
@@ -43,12 +43,10 @@ PreCommit:
     enabled: true
     description: 'Runs rubocop on modified files only'
     command: ['bundle', 'exec', 'rubocop']
-  RakeTarget:
+  PuppetLint:
     enabled: true
-    description: 'Runs lint on modified files only'
-    targets:
-      - 'lint'
-    command: ['bundle', 'exec', 'rake']
+    description: 'Runs puppet-lint on modified files only'
+    command: ['bundle', 'exec', 'puppet-lint']
   YamlSyntax:
     enabled: true
   JsonSyntax:
diff --git a/.pmtignore b/.pmtignore
index a9d37aa..10b9830 100644
--- a/.pmtignore
+++ b/.pmtignore
@@ -20,7 +20,6 @@
 /.github/
 /.librarian/
 /Puppetfile.lock
-/Puppetfile
 *.iml
 /.editorconfig
 /.fixtures.yml
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index 37817b6..02a3e71 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,4 +1 @@
-# Managed by modulesync - DO NOT EDIT
-# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
-
 --fail-on-warnings
diff --git a/.github/labeler.yml b/.rspec
similarity index 63%
rename from .github/labeler.yml
rename to .rspec
index f2d08d6..f634583 100644
--- a/.github/labeler.yml
+++ b/.rspec
@@ -1,6 +1,5 @@
----
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-skip-changelog:
- - head-branch: ['^release-*', 'release']
+--format documentation
+--color
diff --git a/.rspec_parallel b/.rspec_parallel
new file mode 100644
index 0000000..a9a84f8
--- /dev/null
+++ b/.rspec_parallel
@@ -0,0 +1,4 @@
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+--format progress
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05414e3..735795b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,15 +4,6 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
-## [v3.3.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v3.3.0) (2025-02-11)
-
-[Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v3.2.0...v3.3.0)
-
-**Merged pull requests:**
-
-- Add Ubuntu 24.04 support [\#47](https://github.com/voxpupuli/puppet-hashi_stack/pull/47) ([bastelfreak](https://github.com/bastelfreak))
-- puppetlabs/apt: Allow 10.x [\#45](https://github.com/voxpupuli/puppet-hashi_stack/pull/45) ([bastelfreak](https://github.com/bastelfreak))
-
 ## [v3.2.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v3.2.0) (2024-03-24)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v3.1.0...v3.2.0)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..8dd82d6
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,24 @@
+# MANAGED BY MODULESYNC
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+FROM ruby:2.7
+
+WORKDIR /opt/puppet
+
+# https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39
+RUN mkdir -p /etc/sv
+
+ARG PUPPET_GEM_VERSION="~> 6.0"
+ARG PARALLEL_TEST_PROCESSORS=4
+
+# Cache gems
+COPY Gemfile .
+RUN bundle install --without system_tests development release --path=${BUNDLE_PATH:-vendor/bundle}
+
+COPY . .
+
+RUN bundle install
+RUN bundle exec rake release_checks
+
+# Container should not saved
+RUN exit 1
diff --git a/Gemfile b/Gemfile
index f08ae17..a4a3b20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,8 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 10.0',  :require => false
-  gem 'puppet_metadata', '~> 5.0',  :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
+  gem 'coveralls',                  :require => false
+  gem 'simplecov-console',          :require => false
+  gem 'puppet_metadata', '~> 3.5',  :require => false
 end
 
 group :development do
@@ -14,7 +16,7 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 3.5',  :require => false
+  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
 group :release do
@@ -24,7 +26,7 @@ end
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"]
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby
diff --git a/metadata.json b/metadata.json
index 6b66a0a..3349e33 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppet-hashi_stack",
-  "version": "3.3.1-rc0",
+  "version": "3.2.0",
   "author": "Vox Pupuli",
   "summary": "This module contains shared code for various HashiCorp modules",
   "license": "AGPL-3.0",
@@ -14,7 +14,7 @@
     },
     {
       "name": "puppetlabs/apt",
-      "version_requirement": ">= 6.1.0 < 11.0.0"
+      "version_requirement": ">= 6.1.0 < 10.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -68,8 +68,7 @@
       "operatingsystemrelease": [
         "18.04",
         "20.04",
-        "22.04",
-        "24.04"
+        "22.04"
       ]
     }
   ],
@@ -77,10 +76,6 @@
     {
       "name": "puppet",
       "version_requirement": ">= 7.0.0 < 9.0.0"
-    },
-    {
-      "name": "openvox",
-      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ]
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 58c9b66..9efb4ae 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,10 +9,6 @@ ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../lib', __dir__))
 
 require 'voxpupuli/test/spec_helper'
 
-RSpec.configure do |c|
-  c.facterdb_string_keys = false
-end
-
 add_mocked_facts!
 
 if File.exist?(File.join(__dir__, 'default_module_facts.yml'))