diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a4e6e6..fe98fef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+### Changed
+- Set source image to the-works-buildenv:2.0.1
+- Switched Base OS to RockyLinux (9) (inherited from 'the-works-buildenv')
+- Upgraded to PDK 2.7.1.0
+- Locked gem dependency versions for various gem packages
+- Use Shine fork of 3fs-phantomjs puppet module
 
 ## 3.2.0 - 2022-09-01
 ### Changed
diff --git a/Makefile b/Makefile
index 384e55a..6d24226 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ lint:
 		provisioners/*.sh
 
 build-docker-base:
-	scripts/run-playbook-stack.sh build "${config_path}" base
+	PACKER_TMP_DIR=/tmp scripts/run-playbook-stack.sh build "${config_path}" base
 
 publish-docker-base:
 	scripts/run-playbook-stack.sh publish "${config_path}" base
diff --git a/Puppetfile b/Puppetfile
index 51fa3d8..73fb657 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -1,4 +1,4 @@
 forge 'https://forgeapi.puppetlabs.com'
 
-mod '3fs-phantomjs', '1.0.0'
+mod '3fs-phantomjs', :git => 'https://github.com/shinesolutions/puppet-phantomjs', :commit => 'b54ac53d64790fd891d47407e66b65ebc1ba994f'
 mod 'puppetlabs/stdlib', '4.21.0'
diff --git a/provisioners/aem-platform-buildenv.pp b/provisioners/aem-platform-buildenv.pp
index c4b550e..fc4cd1f 100644
--- a/provisioners/aem-platform-buildenv.pp
+++ b/provisioners/aem-platform-buildenv.pp
@@ -53,6 +53,14 @@
   ensure   => '2.5.2',
   provider => 'puppet_gem',
 }
+package { 'faraday-net_http':
+  ensure   => '3.0.2',
+  provider => 'puppet_gem',
+}
+package { 'faraday':
+  ensure   => '2.8.1',
+  provider => 'puppet_gem',
+}
 package { 'r10k':
   ensure   => '3.15.1',
   provider => 'puppet_gem',
@@ -70,17 +78,25 @@
   provider => 'puppet_gem',
 }
 package { 'ruby_aem':
-  ensure   => '3.13.1',
+  ensure   => '3.16.1',
   provider => 'puppet_gem',
 }
 package { 'ruby_aem_aws':
-  ensure   => '2.2.1',
+  ensure   => '3.0.0',
+  provider => 'puppet_gem',
+}
+package { 'nori':
+  ensure   => '2.6.0',
   provider => 'puppet_gem',
 }
 package { 'inspec':
   ensure   => '1.51.6',
   provider => 'puppet_gem',
 }
+package { 'nokogiri':
+  ensure   => '1.15.6',
+  provider => 'puppet_gem',
+}
 package { 'capybara':
   ensure   => '3.30.0',
   provider => 'puppet_gem',
diff --git a/provisioners/puppet.sh b/provisioners/puppet.sh
index aa0c0c2..d63e678 100644
--- a/provisioners/puppet.sh
+++ b/provisioners/puppet.sh
@@ -7,7 +7,7 @@ PUPPET_PATCH_VERSION=0
 PUPPET_AGENT_VERSION="${PUPPET_MAJOR_VERSION}.${PUPPET_MINOR_VERSION}.${PUPPET_PATCH_VERSION}"
 ARCH_TYPE=x86_64
 OS_TYPE=el
-OS_VERSION=7
+OS_VERSION=9
 
 if [[ "$(/opt/puppetlabs/puppet/bin/puppet --version)" == "${PUPPET_AGENT_VERSION}" ]]
 then
@@ -17,7 +17,7 @@ else
     yum -y install "https://yum.puppetlabs.com/puppet${PUPPET_MAJOR_VERSION}/${OS_TYPE}/${OS_VERSION}/${ARCH_TYPE}/puppet-agent-${PUPPET_AGENT_VERSION}-1.${OS_TYPE}${OS_VERSION}.${ARCH_TYPE}.rpm"
 fi
 
-yum -y install https://yum.puppetlabs.com/puppet/${OS_TYPE}/${OS_VERSION}/${ARCH_TYPE}/pdk-2.5.0.0-1.${OS_TYPE}${OS_VERSION}.${ARCH_TYPE}.rpm
+yum -y install https://yum.puppetlabs.com/puppet/${OS_TYPE}/${OS_VERSION}/${ARCH_TYPE}/pdk-2.7.1.0-1.${OS_TYPE}${OS_VERSION}.${ARCH_TYPE}.rpm
 
 # Info
 /opt/puppetlabs/puppet/bin/ruby --version
diff --git a/templates/docker-base.json b/templates/docker-base.json
index 1e1e780..61986e1 100644
--- a/templates/docker-base.json
+++ b/templates/docker-base.json
@@ -8,7 +8,7 @@
   "builders": [
     {
       "type": "docker",
-      "image": "shinesolutions/the-works-buildenv",
+      "image": "shinesolutions/the-works-buildenv:2.0.1",
       "commit": true,
       "run_command": [
         "--privileged",