diff --git a/acceptance/config/beaker/options.rb b/acceptance/config/beaker/options.rb
index bb931b598..588e37b67 100644
--- a/acceptance/config/beaker/options.rb
+++ b/acceptance/config/beaker/options.rb
@@ -11,5 +11,5 @@
  "puppetserver-confdir"=>"/etc/puppetlabs/puppetserver/conf.d",
  "puppetserver-config"=>
   "/etc/puppetlabs/puppetserver/conf.d/puppetserver.conf",
- :puppet_build_version=>"707c40f8be4260ef2388e8923037fbc22318e2bb",
+ :puppet_build_version=>"58f47d22ecf18a5449f386ad0fb87b5156db062e",
  :ssh=>{:config=>true}}
diff --git a/ruby/facter b/ruby/facter
index 421f9731c..a866afe3c 160000
--- a/ruby/facter
+++ b/ruby/facter
@@ -1 +1 @@
-Subproject commit 421f9731c25dcf94f320c3b42de784e17a39c6b8
+Subproject commit a866afe3c4eccc74d1ae519aeecd8dc51b686820