diff --git a/config_defaults.yml b/config_defaults.yml
index d62edc9..9790707 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -5,33 +5,13 @@ Gemfile:
     options:
       groups:
       - 'test'
-  - gem: puppet-lint-empty_string-check
-    options:
-      groups:
-      - 'test'
-  - gem: puppet-lint-file_ensure-check
-    options:
-      groups:
-      - 'test'
-  - gem: puppet-lint-param-docs
-    version: '>= 1.3.0'
-    options:
-      groups:
-      - 'test'
   - gem: puppet-lint-spaceship_operator_without_tag-check
-    options:
-      groups:
-      - 'test'
-  - gem: puppet-lint-strict_indent-check
-    options:
-      groups:
-      - 'test'
-  - gem: puppet-lint-undef_in_function-check
+    version: '~> 1.0'
     options:
       groups:
       - 'test'
   - gem: voxpupuli-test
-    version: '~> 5.0'
+    version: '~> 7.0'
     options:
       groups:
       - 'test'
@@ -41,14 +21,14 @@ Gemfile:
       groups:
       - 'development'
   - gem: 'puppet_metadata'
-    version: '~> 1.3'
+    version: '~> 3.4'
   - gem: puppet-blacksmith
     version: '>= 6.0.0'
     options:
       groups:
       - 'development'
   - gem: 'voxpupuli-acceptance'
-    version: '~> 1.0'
+    version: '~> 2.0'
     options:
       groups:
         - 'system_tests'
diff --git a/moduleroot/.github/workflows/ci.yml.erb b/moduleroot/.github/workflows/ci.yml.erb
index 84b7940..a5cf390 100644
--- a/moduleroot/.github/workflows/ci.yml.erb
+++ b/moduleroot/.github/workflows/ci.yml.erb
@@ -3,8 +3,6 @@ name: CI
 
 on:
   pull_request:
-  schedule:
-    - cron: '4 4 * * *'
 
 
 concurrency:
@@ -15,11 +13,14 @@ jobs:
   puppet:
     name: Puppet
 <%- if Dir[File.join(@metadata[:workdir], 'spec', 'acceptance', '**', '*_spec.rb')].any? -%>
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
       pidfile_workaround: '<%= @configs['pidfile_workaround'] %>'
+<%- if @configs['beaker_facter'] -%>
+      beaker_facter: '<%= @configs['beaker_facter'] %>'
+<%- end -%>
 <%- else -%>
-    uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2
     with:
 <%- end -%>
       rubocop: false
diff --git a/moduleroot/.gitignore.erb b/moduleroot/.gitignore.erb
index 47ed732..4cfb6f1 100644
--- a/moduleroot/.gitignore.erb
+++ b/moduleroot/.gitignore.erb
@@ -29,7 +29,8 @@ vendor/
 .ruby-*
 
 ## rspec
-spec/fixtures/
+spec/fixtures/manifests
+spec/fixtures/modules
 junit/
 
 ## Puppet module
diff --git a/moduleroot/Gemfile.erb b/moduleroot/Gemfile.erb
index e505e8c..66d3d29 100644
--- a/moduleroot/Gemfile.erb
+++ b/moduleroot/Gemfile.erb
@@ -3,14 +3,11 @@
 
 source 'https://rubygems.org'
 
-gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '>= 5.5', groups: ['development', 'test']
+gem 'puppet', ENV.fetch('PUPPET_GEM_VERSION', '>= 7'), groups: ['development', 'test']
 gem 'rake'
 
 <% (@configs['required'] + (@configs['extra'] || [])).each do |gem| -%>
 gem '<%= gem['gem'] %>'<%= ", '#{gem['version']}'" if gem['version'] %><%= ", #{gem['options'].inspect}" if gem['options'] %><%= " if RUBY_VERSION #{gem['ruby_version']}" if (gem['ruby_version']) %>
 <% end -%>
 
-# Pin rdoc to prevent updating bundled psych (https://github.com/ruby/rdoc/commit/ebe185c8775b2afe844eb3da6fa78adaa79e29a4)
-gem 'rdoc', '< 6.4'
-
 # vim:ft=ruby