diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a077911..b66d8ca7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,6 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
       pidfile_workaround: 'false'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0fc788e7..af643fa0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
     with:
       allowed_owner: 'saz'
     secrets:
diff --git a/.msync.yml b/.msync.yml
index b929160c..76cd4646 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: '6.0.0'
+modulesync_config_version: '7.1.0'
diff --git a/.pmtignore b/.pmtignore
index 58a04088..10b98306 100644
--- a/.pmtignore
+++ b/.pmtignore
@@ -35,3 +35,4 @@
 /.yardoc/
 /.yardopts
 /Dockerfile
+/HISTORY.md
diff --git a/Gemfile b/Gemfile
index 98a04cfb..a4a3b204 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 6.0',   :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 3.0',  :require => false
+  gem 'puppet_metadata', '~> 3.5',  :require => false
 end
 
 group :development do
@@ -16,13 +16,11 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
-  gem 'voxpupuli-release', '~> 3.0',              :require => false
-  gem 'faraday-retry', '~> 2.1',                  :require => false
+  gem 'voxpupuli-release', '~> 3.0',  :require => false
 end
 
 gem 'rake', :require => false
diff --git a/lib/puppet/parser/functions/sshclient_options_to_augeas_ssh_config.rb b/lib/puppet/parser/functions/sshclient_options_to_augeas_ssh_config.rb
index 01c1a1f4..7bf8d719 100644
--- a/lib/puppet/parser/functions/sshclient_options_to_augeas_ssh_config.rb
+++ b/lib/puppet/parser/functions/sshclient_options_to_augeas_ssh_config.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Puppet::Parser::Functions
-  newfunction(:sshclient_options_to_augeas_ssh_config, type: :rvalue, doc: <<-'DOC') do |args|
+  newfunction(:sshclient_options_to_augeas_ssh_config, type: :rvalue, doc: <<-DOC) do |args|
   This function will convert a key-value hash to a format understandable by the augeas sshd_config provider
   It will also optionally deal with keys that should be absent, and inject static parameters if supplied.
 
diff --git a/lib/puppet/parser/functions/sshserver_options_to_augeas_sshd_config.rb b/lib/puppet/parser/functions/sshserver_options_to_augeas_sshd_config.rb
index 39a67812..1da59bd8 100644
--- a/lib/puppet/parser/functions/sshserver_options_to_augeas_sshd_config.rb
+++ b/lib/puppet/parser/functions/sshserver_options_to_augeas_sshd_config.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Puppet::Parser::Functions
-  newfunction(:sshserver_options_to_augeas_sshd_config, type: :rvalue, doc: <<-'DOC') do |args|
+  newfunction(:sshserver_options_to_augeas_sshd_config, type: :rvalue, doc: <<-DOC) do |args|
   This function will convert a key-value hash to a format understandable by the augeas sshd_config provider
   It will also optionally deal with keys that should be absent, and inject static parameters if supplied.
 
diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
new file mode 100644
index 00000000..756baef2
--- /dev/null
+++ b/spec/setup_acceptance_node.pp
@@ -0,0 +1,5 @@
+if fact('os.name') == 'Debian' and !fact('aio_agent_version') {
+  package { ['puppet-module-puppetlabs-sshkeys-core']:
+    ensure => present,
+  }
+}
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6515b7bf..9efb4ae6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,3 +17,4 @@
     add_custom_fact name.to_sym, value
   end
 end
+Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }