diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4e115c9b..0c1fd28b 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -25,7 +25,7 @@ jobs:
 
     - name: "Honeycomb: Start first step"
       run: |
-        echo STEP_ID=0 >> $GITHUB_ENV
+        echo STEP_ID=setup-environment >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Checkout Source
@@ -33,29 +33,25 @@ jobs:
       if: ${{ github.repository_owner == 'puppetlabs' }}
 
     - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         ruby-version: "2.7"
+        bundler-cache: true
 
-    - name: Cache gems
-      uses: actions/cache@v2
+    - name: Print bundle environment
       if: ${{ github.repository_owner == 'puppetlabs' }}
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
+      run: |
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
 
-    - name: Install gems
+    - name: "Honeycomb: Record Setup Environment time"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Setup Acceptance Test Matrix
       id: get-matrix
@@ -67,7 +63,7 @@ jobs:
           echo  "::set-output name=matrix::{}"
         fi
 
-    - name: "Honeycomb: Record setup time"
+    - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
@@ -90,7 +86,7 @@ jobs:
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
 
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -106,42 +102,22 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: "2.7"
+        bundler-cache: true
 
-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
-
-    - name: "Honeycomb: Record cache setup time"
-      if: ${{ always() }}
-      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
-    - name: Bundler Setup
+    - name: Print bundle environment
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
 
-    - name: "Honeycomb: Record Bundler Setup time"
+    - name: "Honeycomb: Record Setup Environment time"
       if: ${{ always() }}
       run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Provision test environment
@@ -168,7 +144,7 @@ jobs:
       run: |
         echo ::group::honeycomb step
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
         echo ::endgroup::
 
@@ -180,11 +156,12 @@ jobs:
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Remove test environment
       if: ${{ always() }}
+      continue-on-error: true
       run: |
         if [ -f inventory.yaml ]; then
           buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
@@ -207,7 +184,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Slack Workflow Notification
-        uses: Gamesight/slack-workflow-status@master
+        uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
         with:
           # Required Input
           repo_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index b8f49c75..207dfcad 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -23,7 +23,7 @@ jobs:
 
     - name: "Honeycomb: Start first step"
       run: |
-        echo STEP_ID=0 >> $GITHUB_ENV
+        echo STEP_ID=setup-environment >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Checkout Source
@@ -31,33 +31,28 @@ jobs:
       if: ${{ github.repository_owner == 'puppetlabs' }}
 
     - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         ruby-version: "2.7"
+        bundler-cache: true
 
-    - name: Cache gems
-      uses: actions/cache@v2
+    - name: Print bundle environment
       if: ${{ github.repository_owner == 'puppetlabs' }}
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
+      run: |
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
 
-    - name: Install gems
+    - name: "Honeycomb: Record Setup Environment time"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Setup Acceptance Test Matrix
       id: get-matrix
-      if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
           buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
@@ -65,7 +60,7 @@ jobs:
           echo  "::set-output name=matrix::{}"
         fi
 
-    - name: "Honeycomb: Record setup time"
+    - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
@@ -73,6 +68,7 @@ jobs:
   Acceptance:
     needs:
       - setup_matrix
+    if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
 
     runs-on: ubuntu-20.04
     strategy:
@@ -88,7 +84,7 @@ jobs:
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
 
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -104,42 +100,22 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: "2.7"
+        bundler-cache: true
 
-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
-
-    - name: "Honeycomb: Record cache setup time"
-      if: ${{ always() }}
+    - name: Print bundle environment
       run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
-    - name: Bundler Setup
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
 
-    - name: "Honeycomb: Record Bundler Setup time"
+    - name: "Honeycomb: Record Setup Environment time"
       if: ${{ always() }}
       run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Provision test environment
@@ -166,7 +142,7 @@ jobs:
       run: |
         echo ::group::honeycomb step
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
         echo ::endgroup::
 
@@ -178,11 +154,12 @@ jobs:
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Remove test environment
       if: ${{ always() }}
+      continue-on-error: true
       run: |
         if [ -f inventory.yaml ]; then
           buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
diff --git a/.rubocop.yml b/.rubocop.yml
index 2c47d86d..05378199 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,12 +1,12 @@
 ---
 require:
+- rubocop-performance
 - rubocop-rspec
-- rubocop-i18n
 AllCops:
   DisplayCopNames: true
   TargetRubyVersion: '2.4'
   Include:
-  - "./**/*.rb"
+  - "**/*.rb"
   Exclude:
   - bin/*
   - ".vendor/**/*"
@@ -18,39 +18,54 @@ AllCops:
   - "**/Puppetfile"
   - "**/Vagrantfile"
   - "**/Guardfile"
-inherit_from: ".rubocop_todo.yml"
 Bundler/DuplicatedGem:
   Enabled: false
+Bundler/InsecureProtocolSource:
+  Enabled: false
 Bundler/OrderedGems:
   Enabled: false
-GetText/DecorateFunctionMessage:
+Gemspec/DuplicatedAssignment:
   Enabled: false
-GetText/DecorateString:
+Gemspec/OrderedDependencies:
   Enabled: false
-GetText/DecorateStringFormattingUsingInterpolation:
+Gemspec/RequiredRubyVersion:
   Enabled: false
-GetText/DecorateStringFormattingUsingPercent:
+Gemspec/RubyVersionGlobalsUsage:
   Enabled: false
 Layout/AccessModifierIndentation:
   Enabled: false
-Layout/AlignArray:
+Layout/ArgumentAlignment:
+  Enabled: false
+Layout/ArrayAlignment:
   Enabled: false
-Layout/AlignHash:
+Layout/AssignmentIndentation:
   Enabled: false
-Layout/AlignParameters:
+Layout/BeginEndAlignment:
+  Enabled: false
+Layout/BlockAlignment:
   Enabled: false
 Layout/BlockEndNewline:
   Enabled: false
 Layout/CaseIndentation:
   Enabled: false
+Layout/ClosingHeredocIndentation:
+  Enabled: false
 Layout/ClosingParenthesisIndentation:
   Enabled: false
 Layout/CommentIndentation:
   Enabled: false
+Layout/ConditionPosition:
+  Enabled: false
+Layout/DefEndAlignment:
+  Enabled: false
 Layout/DotPosition:
   Enabled: false
 Layout/ElseAlignment:
   Enabled: false
+Layout/EmptyComment:
+  Enabled: false
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
 Layout/EmptyLineBetweenDefs:
@@ -59,6 +74,10 @@ Layout/EmptyLines:
   Enabled: false
 Layout/EmptyLinesAroundAccessModifier:
   Enabled: false
+Layout/EmptyLinesAroundArguments:
+  Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: false
 Layout/EmptyLinesAroundBeginBody:
   Enabled: false
 Layout/EmptyLinesAroundBlockBody:
@@ -71,28 +90,38 @@ Layout/EmptyLinesAroundMethodBody:
   Enabled: false
 Layout/EmptyLinesAroundModuleBody:
   Enabled: false
+Layout/EndAlignment:
+  Enabled: false
 Layout/EndOfLine:
   Enabled: false
 Layout/ExtraSpacing:
   Enabled: false
-Layout/FirstParameterIndentation:
+Layout/FirstArgumentIndentation:
   Enabled: false
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   Enabled: false
-Layout/IndentAssignment:
+Layout/FirstHashElementIndentation:
   Enabled: false
-Layout/IndentHash:
+Layout/FirstParameterIndentation:
+  Enabled: false
+Layout/HashAlignment:
   Enabled: false
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 Layout/IndentationConsistency:
   Enabled: false
+Layout/IndentationStyle:
+  Enabled: false
 Layout/IndentationWidth:
   Enabled: false
 Layout/InitialIndentation:
   Enabled: false
 Layout/LeadingCommentSpace:
   Enabled: false
+Layout/LeadingEmptyLines:
+  Enabled: false
+Layout/LineLength:
+  Enabled: false
 Layout/MultilineArrayBraceLayout:
   Enabled: false
 Layout/MultilineBlockLayout:
@@ -107,6 +136,8 @@ Layout/MultilineMethodDefinitionBraceLayout:
   Enabled: false
 Layout/MultilineOperationIndentation:
   Enabled: false
+Layout/ParameterAlignment:
+  Enabled: false
 Layout/RescueEnsureAlignment:
   Enabled: false
 Layout/SpaceAfterColon:
@@ -125,6 +156,8 @@ Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 Layout/SpaceAroundKeyword:
   Enabled: false
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: false
 Layout/SpaceAroundOperators:
   Enabled: false
 Layout/SpaceBeforeBlockBraces:
@@ -139,12 +172,12 @@ Layout/SpaceBeforeSemicolon:
   Enabled: false
 Layout/SpaceInLambdaLiteral:
   Enabled: false
+Layout/SpaceInsideArrayLiteralBrackets:
+  Enabled: false
 Layout/SpaceInsideArrayPercentLiteral:
   Enabled: false
 Layout/SpaceInsideBlockBraces:
   Enabled: false
-Layout/SpaceInsideBrackets:
-  Enabled: false
 Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
 Layout/SpaceInsideParens:
@@ -153,11 +186,11 @@ Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false
 Layout/SpaceInsideRangeLiteral:
   Enabled: false
-Layout/SpaceInsideStringInterpolation:
+Layout/SpaceInsideReferenceBrackets:
   Enabled: false
-Layout/Tab:
+Layout/SpaceInsideStringInterpolation:
   Enabled: false
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Enabled: false
 Layout/TrailingWhitespace:
   Enabled: false
@@ -169,47 +202,67 @@ Lint/AmbiguousRegexpLiteral:
   Enabled: false
 Lint/AssignmentInCondition:
   Enabled: false
-Lint/BlockAlignment:
+Lint/BigDecimalNew:
+  Enabled: false
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: false
+Lint/BooleanSymbol:
   Enabled: false
 Lint/CircularArgumentReference:
   Enabled: false
-Lint/ConditionPosition:
+Lint/ConstantDefinitionInBlock:
   Enabled: false
 Lint/Debugger:
   Enabled: false
-Lint/DefEndAlignment:
-  Enabled: false
 Lint/DeprecatedClassMethods:
   Enabled: false
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: false
+Lint/DisjunctiveAssignmentInConstructor:
+  Enabled: false
 Lint/DuplicateCaseCondition:
   Enabled: false
+Lint/DuplicateElsifCondition:
+  Enabled: false
+Lint/DuplicateHashKey:
+  Enabled: false
 Lint/DuplicateMethods:
   Enabled: false
-Lint/DuplicatedKey:
+Lint/DuplicateRequire:
+  Enabled: false
+Lint/DuplicateRescueException:
   Enabled: false
 Lint/EachWithObjectArgument:
   Enabled: false
 Lint/ElseLayout:
   Enabled: false
+Lint/EmptyConditionalBody:
+  Enabled: false
 Lint/EmptyEnsure:
   Enabled: false
 Lint/EmptyExpression:
   Enabled: false
+Lint/EmptyFile:
+  Enabled: false
 Lint/EmptyInterpolation:
   Enabled: false
 Lint/EmptyWhen:
   Enabled: false
-Lint/EndAlignment:
+Lint/EnsureReturn:
   Enabled: false
-Lint/EndInMethod:
+Lint/ErbNewArguments:
   Enabled: false
-Lint/EnsureReturn:
+Lint/FlipFlop:
+  Enabled: false
+Lint/FloatComparison:
   Enabled: false
 Lint/FloatOutOfRange:
   Enabled: false
 Lint/FormatParameterMismatch:
   Enabled: false
-Lint/HandleExceptions:
+Lint/HashCompareByIdentity:
+  Enabled: false
+Lint/IdentityComparison:
   Enabled: false
 Lint/ImplicitStringConcatenation:
   Enabled: false
@@ -217,70 +270,128 @@ Lint/IneffectiveAccessModifier:
   Enabled: false
 Lint/InheritException:
   Enabled: false
-Lint/InvalidCharacterLiteral:
+Lint/InterpolationCheck:
   Enabled: false
-Lint/LiteralInCondition:
+Lint/LiteralAsCondition:
   Enabled: false
 Lint/LiteralInInterpolation:
   Enabled: false
 Lint/Loop:
   Enabled: false
-Lint/MultipleCompare:
+Lint/MissingCopEnableDirective:
+  Enabled: false
+Lint/MissingSuper:
+  Enabled: false
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+Lint/MultipleComparison:
   Enabled: false
 Lint/NestedMethodDefinition:
   Enabled: false
+Lint/NestedPercentLiteral:
+  Enabled: false
 Lint/NextWithoutAccumulator:
   Enabled: false
+Lint/NonDeterministicRequireOrder:
+  Enabled: false
 Lint/NonLocalExitFromIterator:
   Enabled: false
+Lint/OrderedMagicComments:
+  Enabled: false
+Lint/OutOfRangeRegexpRef:
+  Enabled: false
 Lint/ParenthesesAsGroupedExpression:
   Enabled: false
 Lint/PercentStringArray:
   Enabled: false
 Lint/PercentSymbolArray:
   Enabled: false
+Lint/RaiseException:
+  Enabled: false
 Lint/RandOne:
   Enabled: false
+Lint/RedundantCopDisableDirective:
+  Enabled: false
+Lint/RedundantCopEnableDirective:
+  Enabled: false
+Lint/RedundantRequireStatement:
+  Enabled: false
+Lint/RedundantSafeNavigation:
+  Enabled: false
+Lint/RedundantSplatExpansion:
+  Enabled: false
+Lint/RedundantStringCoercion:
+  Enabled: false
+Lint/RedundantWithIndex:
+  Enabled: false
+Lint/RedundantWithObject:
+  Enabled: false
+Lint/RegexpAsCondition:
+  Enabled: false
 Lint/RequireParentheses:
   Enabled: false
 Lint/RescueException:
   Enabled: false
 Lint/RescueType:
   Enabled: false
+Lint/ReturnInVoidContext:
+  Enabled: false
 Lint/SafeNavigationChain:
   Enabled: false
+Lint/SafeNavigationConsistency:
+  Enabled: false
+Lint/SafeNavigationWithEmpty:
+  Enabled: false
 Lint/ScriptPermission:
   Enabled: false
+Lint/SelfAssignment:
+  Enabled: false
+Lint/SendWithMixinArgument:
+  Enabled: false
+Lint/ShadowedArgument:
+  Enabled: false
 Lint/ShadowedException:
   Enabled: false
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
-Lint/StringConversionInInterpolation:
+Lint/StructNewOverride:
   Enabled: false
-Lint/UnderscorePrefixedVariableName:
+Lint/SuppressedException:
   Enabled: false
-Lint/UnifiedInteger:
+Lint/ToJSON:
   Enabled: false
-Lint/UnneededDisable:
+Lint/TopLevelReturnWithArgument:
   Enabled: false
-Lint/UnneededSplatExpansion:
+Lint/TrailingCommaInAttributeDeclaration:
+  Enabled: false
+Lint/UnderscorePrefixedVariableName:
+  Enabled: false
+Lint/UnifiedInteger:
   Enabled: false
 Lint/UnreachableCode:
   Enabled: false
+Lint/UnreachableLoop:
+  Enabled: false
 Lint/UnusedBlockArgument:
   Enabled: false
 Lint/UnusedMethodArgument:
   Enabled: false
+Lint/UriEscapeUnescape:
+  Enabled: false
+Lint/UriRegexp:
+  Enabled: false
 Lint/UselessAccessModifier:
   Enabled: false
 Lint/UselessAssignment:
   Enabled: false
-Lint/UselessComparison:
-  Enabled: false
 Lint/UselessElseWithoutRescue:
   Enabled: false
+Lint/UselessMethodDefinition:
+  Enabled: false
 Lint/UselessSetterCall:
   Enabled: false
+Lint/UselessTimes:
+  Enabled: false
 Lint/Void:
   Enabled: false
 Metrics/AbcSize:
@@ -293,8 +404,6 @@ Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
-Metrics/LineLength:
-  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Metrics/ModuleLength:
@@ -303,9 +412,43 @@ Metrics/ParameterLists:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
-Performance/Caller:
+Migration/DepartmentName:
+  Enabled: false
+Naming/AccessorMethodName:
+  Enabled: false
+Naming/AsciiIdentifiers:
+  Enabled: false
+Naming/BinaryOperatorParameterName:
+  Enabled: false
+Naming/BlockParameterName:
+  Enabled: false
+Naming/ClassAndModuleCamelCase:
+  Enabled: false
+Naming/ConstantName:
+  Enabled: false
+Naming/FileName:
+  Enabled: false
+Naming/HeredocDelimiterCase:
+  Enabled: false
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+Naming/MethodName:
+  Enabled: false
+Naming/MethodParameterName:
+  Enabled: false
+Naming/PredicateName:
   Enabled: false
-Performance/CaseWhenSplat:
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+Naming/VariableName:
+  Enabled: false
+Naming/VariableNumber:
+  Enabled: false
+Performance/BindCall:
+  Enabled: false
+Performance/Caller:
   Enabled: false
 Performance/Casecmp:
   Enabled: false
@@ -313,6 +456,10 @@ Performance/CompareWithBlock:
   Enabled: false
 Performance/Count:
   Enabled: false
+Performance/DeletePrefix:
+  Enabled: false
+Performance/DeleteSuffix:
+  Enabled: false
 Performance/Detect:
   Enabled: false
 Performance/DoubleStartEndWith:
@@ -323,9 +470,7 @@ Performance/FixedSize:
   Enabled: false
 Performance/FlatMap:
   Enabled: false
-Performance/HashEachMethods:
-  Enabled: false
-Performance/LstripRstrip:
+Performance/InefficientHashSearch:
   Enabled: false
 Performance/RangeInclude:
   Enabled: false
@@ -335,14 +480,10 @@ Performance/RedundantMatch:
   Enabled: false
 Performance/RedundantMerge:
   Enabled: false
-Performance/RedundantSortBy:
-  Enabled: false
 Performance/RegexpMatch:
   Enabled: false
 Performance/ReverseEach:
   Enabled: false
-Performance/Sample:
-  Enabled: false
 Performance/Size:
   Enabled: false
 Performance/StartWith:
@@ -351,14 +492,30 @@ Performance/StringReplacement:
   Enabled: false
 Performance/TimesMap:
   Enabled: false
+Performance/UnfreezeString:
+  Enabled: false
+Performance/UriDefaultParser:
+  Enabled: false
 RSpec/AnyInstance:
   Enabled: false
 RSpec/AroundBlock:
   Enabled: false
+RSpec/Be:
+  Enabled: false
 RSpec/BeEql:
   Enabled: false
 RSpec/BeforeAfterAll:
   Enabled: false
+RSpec/Capybara/CurrentPathExpectation:
+  Enabled: false
+RSpec/Capybara/FeatureMethods:
+  Enabled: false
+RSpec/Capybara/VisibilityMatcher:
+  Enabled: false
+RSpec/ContextMethod:
+  Enabled: false
+RSpec/ContextWording:
+  Enabled: false
 RSpec/DescribeClass:
   Enabled: false
 RSpec/DescribeMethod:
@@ -369,26 +526,52 @@ RSpec/DescribedClass:
   Enabled: false
 RSpec/EmptyExampleGroup:
   Enabled: false
+RSpec/EmptyHook:
+  Enabled: false
+RSpec/EmptyLineAfterExample:
+  Enabled: false
+RSpec/EmptyLineAfterExampleGroup:
+  Enabled: false
 RSpec/EmptyLineAfterFinalLet:
   Enabled: false
+RSpec/EmptyLineAfterHook:
+  Enabled: false
 RSpec/EmptyLineAfterSubject:
   Enabled: false
 RSpec/ExampleLength:
   Enabled: false
+RSpec/ExampleWithoutDescription:
+  Enabled: false
 RSpec/ExampleWording:
   Enabled: false
 RSpec/ExpectActual:
   Enabled: false
+RSpec/ExpectChange:
+  Enabled: false
+RSpec/ExpectInHook:
+  Enabled: false
 RSpec/ExpectOutput:
   Enabled: false
+RSpec/FactoryBot/AttributeDefinedStatically:
+  Enabled: false
+RSpec/FactoryBot/CreateList:
+  Enabled: false
+RSpec/FactoryBot/FactoryClassName:
+  Enabled: false
 RSpec/FilePath:
   Enabled: false
 RSpec/Focus:
   Enabled: false
 RSpec/HookArgument:
   Enabled: false
+RSpec/HooksBeforeExamples:
+  Enabled: false
+RSpec/ImplicitBlockExpectation:
+  Enabled: false
 RSpec/ImplicitExpect:
   Enabled: false
+RSpec/ImplicitSubject:
+  Enabled: false
 RSpec/InstanceSpy:
   Enabled: false
 RSpec/InstanceVariable:
@@ -399,18 +582,26 @@ RSpec/IteratedExpectation:
   Enabled: false
 RSpec/LeadingSubject:
   Enabled: false
+RSpec/LeakyConstantDeclaration:
+  Enabled: false
+RSpec/LetBeforeExamples:
+  Enabled: false
 RSpec/LetSetup:
   Enabled: false
 RSpec/MessageChain:
   Enabled: false
-RSpec/MessageExpectation:
-  Enabled: false
 RSpec/MessageSpies:
   Enabled: false
+RSpec/MissingExampleGroupArgument:
+  Enabled: false
 RSpec/MultipleDescribes:
   Enabled: false
 RSpec/MultipleExpectations:
   Enabled: false
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+RSpec/MultipleSubjects:
+  Enabled: false
 RSpec/NamedSubject:
   Enabled: false
 RSpec/NestedGroups:
@@ -419,31 +610,63 @@ RSpec/NotToNot:
   Enabled: false
 RSpec/OverwritingSetup:
   Enabled: false
+RSpec/PredicateMatcher:
+  Enabled: false
+RSpec/ReceiveCounts:
+  Enabled: false
+RSpec/ReceiveNever:
+  Enabled: false
 RSpec/RepeatedDescription:
   Enabled: false
 RSpec/RepeatedExample:
   Enabled: false
+RSpec/RepeatedExampleGroupBody:
+  Enabled: false
+RSpec/RepeatedExampleGroupDescription:
+  Enabled: false
+RSpec/RepeatedIncludeExample:
+  Enabled: false
+RSpec/ReturnFromStub:
+  Enabled: false
 RSpec/ScatteredLet:
   Enabled: false
 RSpec/ScatteredSetup:
   Enabled: false
 RSpec/SharedContext:
   Enabled: false
+RSpec/SharedExamples:
+  Enabled: false
 RSpec/SingleArgumentMessageChain:
   Enabled: false
+RSpec/StubbedMock:
+  Enabled: false
 RSpec/SubjectStub:
   Enabled: false
+RSpec/UnspecifiedException:
+  Enabled: false
+RSpec/VariableDefinition:
+  Enabled: false
+RSpec/VariableName:
+  Enabled: false
 RSpec/VerifiedDoubles:
   Enabled: false
+RSpec/VoidExpect:
+  Enabled: false
+RSpec/Yield:
+  Enabled: false
 Security/Eval:
   Enabled: false
 Security/JSONLoad:
   Enabled: false
 Security/MarshalLoad:
   Enabled: false
+Security/Open:
+  Enabled: false
 Security/YAMLLoad:
   Enabled: false
-Style/AccessorMethodName:
+Style/AccessModifierDeclarations:
+  Enabled: false
+Style/AccessorGrouping:
   Enabled: false
 Style/Alias:
   Enabled: false
@@ -453,67 +676,89 @@ Style/ArrayJoin:
   Enabled: false
 Style/AsciiComments:
   Enabled: false
-Style/AsciiIdentifiers:
-  Enabled: false
 Style/Attr:
   Enabled: false
 Style/BarePercentLiterals:
   Enabled: false
 Style/BeginBlock:
   Enabled: false
+Style/BisectedAttrAccessor:
+  Enabled: false
 Style/BlockComments:
   Enabled: false
 Style/BlockDelimiters:
   Enabled: false
 Style/CaseEquality:
   Enabled: false
-Style/CharacterLiteral:
+Style/CaseLikeIf:
   Enabled: false
-Style/ClassAndModuleCamelCase:
+Style/CharacterLiteral:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
 Style/ClassCheck:
   Enabled: false
+Style/ClassEqualityComparison:
+  Enabled: false
 Style/ClassMethods:
   Enabled: false
 Style/ClassVars:
   Enabled: false
 Style/ColonMethodCall:
   Enabled: false
+Style/ColonMethodDefinition:
+  Enabled: false
+Style/CombinableLoops:
+  Enabled: false
 Style/CommandLiteral:
   Enabled: false
 Style/CommentAnnotation:
   Enabled: false
-Style/ConditionalAssignment:
+Style/CommentedKeyword:
   Enabled: false
-Style/ConstantName:
+Style/ConditionalAssignment:
   Enabled: false
 Style/DefWithParentheses:
   Enabled: false
+Style/Dir:
+  Enabled: false
 Style/Documentation:
   Enabled: false
+Style/DoubleCopDisableDirective:
+  Enabled: false
 Style/DoubleNegation:
   Enabled: false
 Style/EachForSimpleLoop:
   Enabled: false
 Style/EachWithObject:
   Enabled: false
+Style/EmptyBlockParameter:
+  Enabled: false
 Style/EmptyCaseCondition:
   Enabled: false
 Style/EmptyElse:
   Enabled: false
+Style/EmptyLambdaParameter:
+  Enabled: false
 Style/EmptyLiteral:
   Enabled: false
 Style/EmptyMethod:
   Enabled: false
+Style/Encoding:
+  Enabled: false
 Style/EndBlock:
   Enabled: false
+Style/EvalWithLocation:
+  Enabled: false
 Style/EvenOdd:
   Enabled: false
-Style/FileName:
+Style/ExpandPathArguments:
+  Enabled: false
+Style/ExplicitBlockArgument:
   Enabled: false
-Style/FlipFlop:
+Style/ExponentialNotation:
+  Enabled: false
+Style/FloatDivision:
   Enabled: false
 Style/For:
   Enabled: false
@@ -523,12 +768,24 @@ Style/FormatStringToken:
   Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: false
+Style/GlobalStdStream:
+  Enabled: false
 Style/GlobalVars:
   Enabled: false
 Style/GuardClause:
   Enabled: false
+Style/HashAsLastArrayItem:
+  Enabled: false
+Style/HashEachMethods:
+  Enabled: false
+Style/HashLikeCase:
+  Enabled: false
 Style/HashSyntax:
   Enabled: false
+Style/HashTransformKeys:
+  Enabled: false
+Style/HashTransformValues:
+  Enabled: false
 Style/IdenticalConditionalBranches:
   Enabled: false
 Style/IfInsideElse:
@@ -543,6 +800,8 @@ Style/InfiniteLoop:
   Enabled: false
 Style/InverseMethods:
   Enabled: false
+Style/KeywordParametersOrder:
+  Enabled: false
 Style/Lambda:
   Enabled: false
 Style/LambdaCall:
@@ -553,12 +812,14 @@ Style/MethodCallWithoutArgsParentheses:
   Enabled: false
 Style/MethodDefParentheses:
   Enabled: false
-Style/MethodMissing:
+Style/MinMax:
   Enabled: false
-Style/MethodName:
+Style/MissingRespondToMissing:
   Enabled: false
 Style/MixinGrouping:
   Enabled: false
+Style/MixinUsage:
+  Enabled: false
 Style/ModuleFunction:
   Enabled: false
 Style/MultilineBlockChain:
@@ -571,12 +832,16 @@ Style/MultilineMemoization:
   Enabled: false
 Style/MultilineTernaryOperator:
   Enabled: false
+Style/MultilineWhenThen:
+  Enabled: false
 Style/MultipleComparison:
   Enabled: false
 Style/MutableConstant:
   Enabled: false
 Style/NegatedIf:
   Enabled: false
+Style/NegatedUnless:
+  Enabled: false
 Style/NegatedWhile:
   Enabled: false
 Style/NestedModifier:
@@ -601,10 +866,12 @@ Style/NumericPredicate:
   Enabled: false
 Style/OneLineConditional:
   Enabled: false
-Style/OpMethod:
-  Enabled: false
 Style/OptionalArguments:
   Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false
+Style/OrAssignment:
+  Enabled: false
 Style/ParallelAssignment:
   Enabled: false
 Style/ParenthesesAroundCondition:
@@ -615,48 +882,90 @@ Style/PercentQLiterals:
   Enabled: false
 Style/PerlBackrefs:
   Enabled: false
-Style/PredicateName:
-  Enabled: false
 Style/PreferredHashMethods:
   Enabled: false
 Style/Proc:
   Enabled: false
 Style/RaiseArgs:
   Enabled: false
+Style/RandomWithOffset:
+  Enabled: false
+Style/RedundantAssignment:
+  Enabled: false
 Style/RedundantBegin:
   Enabled: false
+Style/RedundantCapitalW:
+  Enabled: false
+Style/RedundantCondition:
+  Enabled: false
+Style/RedundantConditional:
+  Enabled: false
 Style/RedundantException:
   Enabled: false
+Style/RedundantFetchBlock:
+  Enabled: false
+Style/RedundantFileExtensionInRequire:
+  Enabled: false
 Style/RedundantFreeze:
   Enabled: false
+Style/RedundantInterpolation:
+  Enabled: false
 Style/RedundantParentheses:
   Enabled: false
+Style/RedundantPercentQ:
+  Enabled: false
+Style/RedundantRegexpCharacterClass:
+  Enabled: false
+Style/RedundantRegexpEscape:
+  Enabled: false
 Style/RedundantReturn:
   Enabled: false
 Style/RedundantSelf:
   Enabled: false
+Style/RedundantSelfAssignment:
+  Enabled: false
+Style/RedundantSort:
+  Enabled: false
+Style/RedundantSortBy:
+  Enabled: false
 Style/RegexpLiteral:
   Enabled: false
 Style/RescueModifier:
   Enabled: false
+Style/RescueStandardError:
+  Enabled: false
 Style/SafeNavigation:
   Enabled: false
+Style/Sample:
+  Enabled: false
 Style/SelfAssignment:
   Enabled: false
 Style/Semicolon:
   Enabled: false
 Style/SignalException:
   Enabled: false
+Style/SingleArgumentDig:
+  Enabled: false
 Style/SingleLineMethods:
   Enabled: false
+Style/SlicingWithRange:
+  Enabled: false
+Style/SoleNestedConditional:
+  Enabled: false
 Style/SpecialGlobalVars:
   Enabled: false
 Style/StabbyLambdaParentheses:
   Enabled: false
+Style/StderrPuts:
+  Enabled: false
+Style/StringConcatenation:
+  Enabled: false
 Style/StringLiterals:
   Enabled: false
 Style/StringLiteralsInInterpolation:
   Enabled: false
+Style/Strip:
+  Enabled: false
 Style/StructInheritance:
   Enabled: false
 Style/SymbolArray:
@@ -667,9 +976,19 @@ Style/SymbolProc:
   Enabled: false
 Style/TernaryParentheses:
   Enabled: false
+Style/TrailingBodyOnClass:
+  Enabled: false
+Style/TrailingBodyOnMethodDefinition:
+  Enabled: false
+Style/TrailingBodyOnModule:
+  Enabled: false
 Style/TrailingCommaInArguments:
   Enabled: false
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+Style/TrailingMethodEndStatement:
   Enabled: false
 Style/TrailingUnderscoreVariable:
   Enabled: false
@@ -677,18 +996,10 @@ Style/TrivialAccessors:
   Enabled: false
 Style/UnlessElse:
   Enabled: false
-Style/UnneededCapitalW:
-  Enabled: false
-Style/UnneededInterpolation:
-  Enabled: false
-Style/UnneededPercentQ:
+Style/UnpackFirst:
   Enabled: false
 Style/VariableInterpolation:
   Enabled: false
-Style/VariableName:
-  Enabled: false
-Style/VariableNumber:
-  Enabled: false
 Style/WhenThen:
   Enabled: false
 Style/WhileUntilDo:
@@ -701,3 +1012,59 @@ Style/YodaCondition:
   Enabled: false
 Style/ZeroLengthPredicate:
   Enabled: false
+Lint/DuplicateBranch:
+  Enabled: false
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: false
+Lint/EmptyBlock:
+  Enabled: false
+Lint/EmptyClass:
+  Enabled: false
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
+Lint/ToEnumArguments:
+  Enabled: false
+Lint/UnexpectedBlockArity:
+  Enabled: false
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: false
+Performance/AncestorsInclude:
+  Enabled: false
+Performance/BigDecimalWithNumericArgument:
+  Enabled: false
+Performance/BlockGivenWithExplicitBlock:
+  Enabled: false
+Performance/CollectionLiteralInLoop:
+  Enabled: false
+Performance/ConstantRegexp:
+  Enabled: false
+Performance/MethodObjectAsBlock:
+  Enabled: false
+Performance/RedundantSortBlock:
+  Enabled: false
+Performance/RedundantStringChars:
+  Enabled: false
+Performance/ReverseFirst:
+  Enabled: false
+Performance/SortReverse:
+  Enabled: false
+Performance/Squeeze:
+  Enabled: false
+Performance/StringInclude:
+  Enabled: false
+Performance/Sum:
+  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
+Style/CollectionCompact:
+  Enabled: false
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+Style/NegatedIfElseCondition:
+  Enabled: false
+Style/NilLambda:
+  Enabled: false
+Style/RedundantArgument:
+  Enabled: false
+Style/SwapValues:
+  Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index 81536b01..00000000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2019-10-30 10:31:01 -0500 using RuboCop version 0.49.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 6
-GetText/DecorateFunctionMessage:
-  Exclude:
-    - 'lib/puppet/provider/exec/powershell.rb'
-    - 'lib/puppet/provider/exec/pwsh.rb'
-    - 'spec/spec_helper_acceptance.rb'
-
-# Offense count: 3
-GetText/DecorateString:
-  Exclude:
-    - 'lib/puppet/provider/exec/powershell.rb'
-    - 'lib/puppet/provider/exec/pwsh.rb'
diff --git a/.sync.yml b/.sync.yml
index a34310dd..a69e7ab9 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -2,10 +2,9 @@
 ".gitlab-ci.yml":
   delete: true
 ".rubocop.yml":
-  include_todos: true
   selected_profile: false
 ".travis.yml":
-  global_env: 
+  global_env:
     - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
   deploy_to_forge:
     enabled: false
@@ -22,9 +21,9 @@
     env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
     rvm: 2.5.3
     stage: spec
-  - bundler_args: 
-    os: osx
-    rvm: 2.5.1
+  - os: osx
+    bundler_args: --with system_tests
+    rvm: 2.5.3
     before_script:
     - brew update
     - brew install openssl
@@ -54,9 +53,6 @@ Gemfile:
     ":development":
     - gem: ruby-pwsh
     - gem: github_changelog_generator
-      git: https://github.com/skywinder/github-changelog-generator
-      ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
-      condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 spec/spec_helper.rb:
   coverage_report: true
 .gitpod.Dockerfile:
diff --git a/.travis.yml b/.travis.yml
index dffd0cf7..4be9e06b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,68 +27,68 @@ stages:
 jobs:
   fast_finish: true
   include:
-    -
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_deb_puppet5
+      env:
+        PLATFORMS: travis_deb_puppet5
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_ub]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_ub_puppet5
+      env:
+        PLATFORMS: travis_ub_puppet5
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_el7_puppet5
+      env:
+        PLATFORMS: travis_el7_puppet5
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_deb_puppet6
+      env:
+        PLATFORMS: travis_deb_puppet6
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_ub]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_ub_puppet6
+      env:
+        PLATFORMS: travis_ub_puppet6
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
-    -
-      before_script:
+    - before_script:
       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_el7_puppet6
+      env:
+        PLATFORMS: travis_el7_puppet6
+        BUNDLE_WITH: system_tests
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
@@ -111,9 +111,9 @@ jobs:
       stage: spec
     -
       before_script: ["brew update", "brew install openssl", "bundle exec rake spec_prep"]
-      bundler_args: 
+      bundler_args: --with system_tests
       os: osx
-      rvm: 2.5.1
+      rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:localhost"]
       stage: acceptance
 branches:
diff --git a/Gemfile b/Gemfile
index 1202a551..122328df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,20 +17,19 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "fast_gettext", '1.1.0',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem "fast_gettext",                                            require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
-  gem "json_pure", '<= 2.0.1',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "json", '= 1.8.1',                                         require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
   gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "ruby-pwsh",                                               require: false
-  gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
+  gem "github_changelog_generator",                              require: false
+end
+group :system_tests do
+  gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
+  gem "puppet-module-win-system-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index 0a5093b3..2906c15b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'bundler'
 require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
diff --git a/lib/puppet/provider/exec/powershell.rb b/lib/puppet/provider/exec/powershell.rb
index 3fab17fa..8114662c 100644
--- a/lib/puppet/provider/exec/powershell.rb
+++ b/lib/puppet/provider/exec/powershell.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :powershell, :parent => Puppet::Provider::Exec do
diff --git a/lib/puppet/provider/exec/pwsh.rb b/lib/puppet/provider/exec/pwsh.rb
index f51dbcb1..10376c5f 100644
--- a/lib/puppet/provider/exec/pwsh.rb
+++ b/lib/puppet/provider/exec/pwsh.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :pwsh, :parent => Puppet::Provider::Exec do
diff --git a/metadata.json b/metadata.json
index 0f8d97c3..31a9c269 100644
--- a/metadata.json
+++ b/metadata.json
@@ -80,7 +80,7 @@
       "version_requirement": ">= 5.5.0 < 8.0.0"
     }
   ],
-  "pdk-version": "1.18.1",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#main",
-  "template-ref": "heads/main-0-g525d981"
+  "pdk-version": "1.19.0.pre (47)",
+  "template-url": "https://github.com/DavidS/pdk-templates#revert-litmus-protection",
+  "template-ref": "remotes/origin/revert-litmus-protection-0-g5888511"
 }
diff --git a/spec/acceptance/exec_powershell_spec.rb b/spec/acceptance/exec_powershell_spec.rb
index 1ebc4537..1bf399b9 100644
--- a/spec/acceptance/exec_powershell_spec.rb
+++ b/spec/acceptance/exec_powershell_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 
 describe 'powershell provider:', if: (os[:family] == 'windows') do
diff --git a/spec/acceptance/exec_pwsh_spec.rb b/spec/acceptance/exec_pwsh_spec.rb
index afccb888..6dcd32ea 100644
--- a/spec/acceptance/exec_pwsh_spec.rb
+++ b/spec/acceptance/exec_pwsh_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 
 def windows_platform?
diff --git a/spec/fixtures/scripts/install_pwsh/darwin.sh b/spec/fixtures/scripts/install_pwsh/darwin.sh
index b67fcb00..cf1c16c6 100644
--- a/spec/fixtures/scripts/install_pwsh/darwin.sh
+++ b/spec/fixtures/scripts/install_pwsh/darwin.sh
@@ -1 +1 @@
-brew cask install powershell
+brew install --cask powershell
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 3fb5a1d4..3b433a00 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet_litmus'
 require 'puppet_litmus/util'
 require 'singleton'
diff --git a/spec/unit/provider/exec/powershell_spec.rb b/spec/unit/provider/exec/powershell_spec.rb
index 44cf74d4..8aa48a14 100644
--- a/spec/unit/provider/exec/powershell_spec.rb
+++ b/spec/unit/provider/exec/powershell_spec.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'puppet/util'
 require 'fileutils'
diff --git a/spec/unit/provider/exec/pwsh_spec.rb b/spec/unit/provider/exec/pwsh_spec.rb
index eb7f0a91..045a157e 100644
--- a/spec/unit/provider/exec/pwsh_spec.rb
+++ b/spec/unit/provider/exec/pwsh_spec.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'puppet/util'
 require 'ruby-pwsh'