diff --git a/Gemfile b/Gemfile
index 8e960b83..748b6e95 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'collimator', '0.0.3'
 gem 'mcollective-client', '2.8.2'
-gem 'puppet', '3.7.5'
+gem 'puppet', '6.25.1'
 gem 'rspec', '3.3.0' # used by stacks test command
 gem 'rubocop', '0.32.1'
 gem 'orc', :git => 'https://github.com/tim-group/orc.git', :ref => '2daa527d5a251e9cf2396ba5282a0a4b23e5500c'
diff --git a/Gemfile.lock b/Gemfile.lock
index bfa9c2f4..8c0dcd61 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,22 +24,27 @@ GEM
     collimator (0.0.3)
       colored
     colored (1.2)
+    concurrent-ruby (1.1.9)
+    deep_merge (1.2.1)
     diff-lcs (1.3)
-    facter (2.5.7)
-    facter (2.5.7-universal-darwin)
-      CFPropertyList (~> 2.2)
+    facter (4.2.5)
+      hocon (~> 1.3)
+      thor (>= 1.0.1, < 2.0)
+    fast_gettext (1.8.0)
     git (1.7.0)
       rchardet (~> 1.8)
     hashdiff (1.0.1)
-    hiera (1.3.4)
-      json_pure
+    hiera (3.7.0)
+    hocon (1.3.1)
+    httpclient (2.8.3)
     json (2.3.0)
-    json_pure (2.2.0)
+    locale (2.1.3)
     mcollective-client (2.8.2)
       json
       stomp
       systemu
     method_source (0.9.2)
+    multi_json (1.15.0)
     parser (2.7.0.2)
       ast (~> 2.4.0)
     powerpack (0.1.2)
@@ -49,10 +54,31 @@ GEM
     pry-byebug (3.4.3)
       byebug (>= 9.0, < 9.1)
       pry (~> 0.10)
-    puppet (3.7.5)
-      facter (> 1.6, < 3)
-      hiera (~> 1.0)
-      json_pure
+    puppet (6.25.1)
+      concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
+      facter (> 2.0.1, < 5)
+      fast_gettext (~> 1.1)
+      hiera (>= 3.2.1, < 4)
+      httpclient (~> 2.8)
+      locale (~> 2.1)
+      multi_json (~> 1.10)
+      puppet-resource_api (~> 1.5)
+      semantic_puppet (~> 1.0)
+    puppet (6.25.1-universal-darwin)
+      CFPropertyList (~> 2.2)
+      concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
+      facter (> 2.0.1, < 5)
+      fast_gettext (~> 1.1)
+      hiera (>= 3.2.1, < 4)
+      httpclient (~> 2.8)
+      locale (~> 2.1)
+      multi_json (~> 1.10)
+      puppet-resource_api (~> 1.5)
+      semantic_puppet (~> 1.0)
+    puppet-resource_api (1.8.14)
+      hocon (>= 1.0)
     rainbow (2.2.2)
       rake
     rake (10.1.0)
@@ -77,9 +103,11 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.10.1)
+    semantic_puppet (1.0.4)
     stomp (1.4.9)
     syck (1.4.0)
     systemu (2.6.5)
+    thor (1.1.0)
 
 PLATFORMS
   ruby
@@ -94,7 +122,7 @@ DEPENDENCIES
   orc!
   pry
   pry-byebug
-  puppet (= 3.7.5)
+  puppet (= 6.25.1)
   rake (= 10.1.0)
   rspec (= 3.3.0)
   rubocop (= 0.32.1)