diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9531bfd..a660052 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -296,7 +296,7 @@ variables:
 #=======================================================================
 
 releng_checks:
-  <<: *pup_5_x
+  <<: *pup_6_x
   <<: *setup_bundler_env
   stage: 'validation'
   tags: ['docker']
@@ -307,7 +307,8 @@ releng_checks:
     - 'bundle exec rake pkg:check_version'
     - 'bundle exec rake pkg:compare_latest_tag'
     - 'bundle exec rake pkg:create_tag_changelog'
-    - 'bundle exec puppet module build'
+    - 'bundle exec pdk build --force --target-dir=dist'
+
 
 # Linting
 #-----------------------------------------------------------------------
diff --git a/.pmtignore b/.pmtignore
index 9d74016..02aebfb 100644
--- a/.pmtignore
+++ b/.pmtignore
@@ -7,21 +7,25 @@
 # The next baseline sync will overwrite any local changes made to this file.
 # ------------------------------------------------------------------------------
 .*.sw?
+.bundle/
+.git/
+.github/
+.gitlab-ci.yml
+.rspec_system
+.vagrant/
+.vendor/
 .yardoc
 dist/
+doc/
+Gemfile.lock
+junit/
+log/
 pkg/
+spec/acceptance/
 spec/defines/
 spec/fixtures/
-spec/acceptance/
 spec/rp_env/
-!/spec/hieradata/default.yaml
 !/spec/fixtures/site.pp
-.rspec_system
-.vagrant/
-.bundle/
-Gemfile.lock
-vendor/
-junit/
-log/
-doc/
+!/spec/hieradata/default.yaml
 tests/
+vendor/
diff --git a/Gemfile b/Gemfile
index e9a9a7d..e9eb071 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ group :test do
   gem 'puppet-lint-trailing_comma-check', :require => false
   gem 'simp-rspec-puppet-facts', ENV['SIMP_RSPEC_PUPPET_FACTS_VERSION'] || '~> 3.1'
   gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.11.5', '< 6']
-  gem( 'pdk', ENV['PDK_VERSION'] || '~> 1.0', :require => false) if major_puppet_version > 5
+  gem( 'pdk', ENV['PDK_VERSION'] || '~> 2.0', :require => false) if major_puppet_version > 5
   gem 'pathspec', '~> 0.2' if Gem::Requirement.create('< 2.6').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
 end