diff --git a/.fixtures.yml b/.fixtures.yml
index 7fc2ed14..8352f4cd 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -4,3 +4,6 @@ fixtures:
     stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
     zypprepo: https://github.com/voxpupuli/puppet-zypprepo.git
     elastic_stack: https://github.com/voxpupuli/puppet-elastic_stack.git
+    yumrepo_core: 
+      repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
+      puppet_version: ">= 6.0.0"
diff --git a/.gitignore b/.gitignore
index cca98112..01100370 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ doc
 *.lock
 **.swp
 files/logstash-output-cowsay-5.0.0.zip
+.vscode/
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 22af19d7..f59bc855 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
-ruby '2.3.4'
+ruby '2.7.4'
 
-puppetversion = ENV['PUPPET_VERSION'] || '4.10.7'
+puppetversion = ENV['PUPPET_VERSION'] || '~> 6'
 gem 'puppet', puppetversion, :require => false
 
-gem 'beaker', '3.15.0'
-gem 'beaker-pe', '1.13.0'
-gem 'beaker-rspec', '6.1.0'
+gem 'beaker', '4.38.1'
+gem 'beaker-pe', '2.11.24'
+gem 'beaker-rspec', '7.1.0'
 
 # REF: https://github.com/voxpupuli/metadata-json-lint/issues/10
 # gem 'metadata-json-lint'
@@ -15,12 +15,12 @@ gem 'rspec-puppet'
 
 gem 'pry'
 gem 'pry-rescue'
-gem 'docker-api', '~> 1.0'
+gem 'docker-api', '~> 1.22'
 gem 'rubysl-securerandom'
 gem 'ci_reporter_rspec'
-gem 'google-api-client', '0.9.4' # 0.9.5 needs Ruby 2.
+gem 'google-api-client', '0.11' 
 gem 'rgen'
-gem 'rspec', '~> 3.0'
+gem 'rspec', '~> 3.12'
 gem 'rake'
 gem 'metadata-json-lint'
 gem 'puppet-doc-lint'
@@ -31,8 +31,8 @@ gem 'puppet-syntax'
 gem 'rspec-puppet-facts'
 gem 'rubocop'
 gem 'semantic_puppet'
-gem 'serverspec', '2.38.0'
-gem 'specinfra', '2.67.3'
+gem 'serverspec', '2.42.0'
+gem 'specinfra', '2.83.4'
 gem 'syck'
 gem 'webmock'
 gem 'redcarpet'
diff --git a/README.md b/README.md
index e0eb474f..8dcc312f 100644
--- a/README.md
+++ b/README.md
@@ -4,15 +4,9 @@ A Puppet module for managing and configuring [Logstash](http://logstash.net/).
 
 [![Build Status](https://travis-ci.org/elastic/puppet-logstash.png?branch=master)](https://travis-ci.org/elastic/puppet-logstash)
 
-## Logstash Versions
-
-This module, "elastic/logstash" supports only Logstash 5.x and 6.x. For earlier
-Logstash versions, support is provided by the legacy module
-"elasticsearch/logstash".
-
 ## Requirements
 
-* Puppet 4.6.1 or better.
+* Puppet 6 or better.
 * The [stdlib](https://forge.puppetlabs.com/puppetlabs/stdlib) module.
 * Logstash itself requires Java 8. The "puppetlabs/java" module is recommended
   for installing Java. This module will not install Java.
diff --git a/metadata.json b/metadata.json
index e6d20c62..b1d0b3de 100644
--- a/metadata.json
+++ b/metadata.json
@@ -70,7 +70,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">=4.6.1 <6.0.0"
+      "version_requirement": ">=4.6.1 <=7.21.0"
     }
   ]
 }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 78d74b32..5c56ae2d 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -9,9 +9,9 @@
   raise 'Please set the LOGSTASH_VERSION environment variable.'
 end
 LS_VERSION = ENV['LOGSTASH_VERSION']
-PUPPET_VERSION = ENV['PUPPET_VERSION'] || '4.10.7'
+PUPPET_VERSION = ENV['PUPPET_VERSION'] || '6.25.1'
 
-PE_VERSION = ENV['BEAKER_PE_VER'] || ENV['PE_VERSION'] || '3.8.3'
+PE_VERSION = ENV['BEAKER_PE_VER'] || ENV['PE_VERSION'] || '4.38.1'
 PE_DIR = ENV['BEAKER_PE_DIR']
 
 if LS_VERSION =~ /(alpha|beta|rc)/