diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 12ed4ff1..6062e804 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,5 +1,8 @@
 FROM puppet/pdk:latest
 
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends build-essential 
+
 # [Optional] Uncomment this section to install additional packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 #     && apt-get -y install --no-install-recommends <your-package-list-here>
diff --git a/.sync.yml b/.sync.yml
index cf21eb72..f87f1b51 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -35,3 +35,5 @@ spec/spec_helper.rb:
   unmanaged: false
 .travis.yml:
   delete: true
+.devcontainer/Dockerfile:
+  unmanaged: true
diff --git a/Gemfile b/Gemfile
index 7d7634d5..d2a2af08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,6 +32,7 @@ group :development do
   gem "rb-readline", '= 0.5.5',                        require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "ruby-pwsh",                                     require: false
   gem "github_changelog_generator",                    require: false
+  gem "net-ssh", '< 7.0.0',                            require: false
 end
 group :system_tests do
   gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
diff --git a/Guardfile b/Guardfile
deleted file mode 100644
index f590e494..00000000
--- a/Guardfile
+++ /dev/null
@@ -1,23 +0,0 @@
-notification :off
-
-scope group: :spec
-
-group :spec do
-  guard :rake, :task => 'test' do
-    watch(%r{^lib\/.+\.rb$})
-    watch(%r{^spec\/.+\.rb$})
-		watch(%r{^manifests\/.+\.pp$})
-  end
-end
-
-group :acceptance do
-  guard :rake, :task => 'acceptance' do
-    watch(%r{^spec\/acceptance\/.+\.rb$})
-  end
-end
-
-group :acceptance_swarm do
-  guard :rake, :task => 'acceptance_swarm' do
-    watch(%r{^spec\/acceptance_swarm\/.+\.rb$})
-  end
-end
\ No newline at end of file
diff --git a/rakelib/acceptance.rake b/rakelib/acceptance.rake
deleted file mode 100644
index c76ae982..00000000
--- a/rakelib/acceptance.rake
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'rake'
-require 'parallel_tests'
-
-# We clear the Beaker rake tasks from spec_helper as they assume
-# rspec-puppet and a certain filesystem layout
-Rake::Task[:beaker_nodes].clear
-Rake::Task[:beaker].clear
-
-desc 'Run acceptance tests'
-RSpec::Core::RakeTask.new(acceptance: [:spec_prep]) do |t|
-  t.pattern = 'spec/acceptance'
-end
-
-namespace :acceptance do
-  {
-    vagrant: [
-      'centos-70-x64',
-      'debian-81-x64',
-      'ubuntu-1404-x64',
-      'ubuntu-1604-x64',
-    ],
-    pooler: [
-      'centos7',
-      'rhel7',
-      'ubuntu-1404',
-      'ubuntu-1604',
-      'ubuntu-1610',
-      'ubuntu-1804',
-      'debian-8',
-      'debian-9',
-      'win-2016',
-    ],
-  }.each do |ns, configs|
-    namespace ns.to_sym do
-      configs.each do |config|
-        desc "Run acceptance tests for #{ns}:#{config}"
-        RSpec::Core::RakeTask.new(config.to_s.to_sym => [:spec_prep]) do |t|
-          ENV['BEAKER_keyfile'] = '~/.ssh/id_rsa-acceptance' if ns == :pooler
-          ENV['BEAKER_set'] = "#{ns}/#{config}"
-          t.pattern = 'spec/acceptance'
-        end
-      end
-    end
-  end
-end
diff --git a/rakelib/acceptance_swarm.rake b/rakelib/acceptance_swarm.rake
deleted file mode 100644
index 8ca10a0a..00000000
--- a/rakelib/acceptance_swarm.rake
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'rake'
-require 'parallel_tests'
-
-# We clear the Beaker rake tasks from spec_helper as they assume
-# rspec-puppet and a certain filesystem layout
-Rake::Task[:beaker_nodes].clear
-Rake::Task[:beaker].clear
-
-desc 'Run acceptance tests'
-RSpec::Core::RakeTask.new(acceptance_swarm: [:spec_prep]) do |t|
-  t.pattern = 'spec/acceptance_swarm'
-end
-
-namespace :acceptance_swarm do
-  {
-    pooler: [
-      'ubuntu-1604',
-      'win-2016',
-    ],
-  }.each do |ns, configs|
-    namespace ns.to_sym do
-      configs.each do |config|
-        desc "Run acceptance tests for #{ns}:#{config}"
-        RSpec::Core::RakeTask.new(config.to_s.to_sym => [:spec_prep]) do |t|
-          ENV['BEAKER_keyfile'] = '~/.ssh/id_rsa-acceptance' if ns == :pooler
-          ENV['BEAKER_setdir'] = 'spec/acceptance_swarm/nodesets'
-          ENV['BEAKER_set'] = "#{ns}/#{config}"
-          t.pattern = 'spec/acceptance_swarm'
-        end
-      end
-    end
-  end
-end