diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8220358..a107886 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'puppetlabs'
     steps:
-      - uses: actions/checkout@v4
-      - name: Install Ruby 3.0
+      - uses: actions/checkout@v6
+      - name: Install Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.1'
         env:
           BUNDLE_WITHOUT: release
       - name: Build gem
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0f2f7a4..5ce8f46 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,11 +13,11 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: '3.3'
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rake rubocop
@@ -29,18 +29,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: "2.7"
-          - ruby: "3.0"
-            coverage: "yes"
-          - ruby: "3.1"
-          - ruby: "3.2"
-          - ruby: "3.3"
+          - ruby: '3.1'
+          - ruby: '3.2'
+          - ruby: '3.3'
 
-    env:
-      COVERAGE: ${{ matrix.coverage }}
     name: RSpec - Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 62804b7..6feebe4 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -655,12 +655,6 @@ RSpec/SpecFilePathFormat:
     - 'spec/beaker-puppet/install_utils/windows_utils_spec.rb'
     - 'spec/beaker-puppet/wrappers_spec.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/StringAsInstanceDoubleConstant:
-  Exclude:
-    - 'spec/beaker-puppet/install_utils/module_utils_spec.rb'
-
 # Offense count: 88
 RSpec/StubbedMock:
   Exclude:
diff --git a/lib/beaker-puppet/install_utils/foss_utils.rb b/lib/beaker-puppet/install_utils/foss_utils.rb
index 3e743a8..4cc5d75 100644
--- a/lib/beaker-puppet/install_utils/foss_utils.rb
+++ b/lib/beaker-puppet/install_utils/foss_utils.rb
@@ -139,7 +139,7 @@ def extract_repo_info_from(uri)
         def order_packages(packages_array)
           puppet = packages_array.select { |e| e[:name] == 'puppet' }
           puppet_depends_on = packages_array.select do |e|
-            e[:name] == 'hiera' or e[:name] == 'facter'
+            e[:name].include?('hiera') || e[:name].include?('facter')
           end
           depends_on_puppet = (packages_array - puppet) - puppet_depends_on
           [puppet_depends_on, puppet, depends_on_puppet].flatten
diff --git a/spec/beaker-puppet/install_utils/foss_utils_spec.rb b/spec/beaker-puppet/install_utils/foss_utils_spec.rb
index b9d16b1..17b4276 100644
--- a/spec/beaker-puppet/install_utils/foss_utils_spec.rb
+++ b/spec/beaker-puppet/install_utils/foss_utils_spec.rb
@@ -313,7 +313,7 @@ def logger
       subject.instance_variable_set(:@metadata, {})
       version = subject.find_git_repo_versions(host, path, repository)
 
-      expect(version).to be == { 'name' => '2' } # rubocop:ignore RSpec/Eq
+      expect(version).to be == { 'name' => '2' } # rubocop:disable RSpec/Eq
     end
   end