diff --git a/Vagrantfile b/Vagrantfile
index 88e591aef..8f6d3e339 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -46,7 +46,7 @@ Vagrant.configure(2) do |config|
   config.vm.box_download_checksum_type = 'md5'
 
   ## Ensure puppet installed within guest
-  config.puppet_install.puppet_version = '4.9.2'
+  config.puppet_install.puppet_version = '4.9.3'
 
   ## Create a forwarded port mapping which allows access to a specific port
   #  within the machine from a port on the host machine. In the example below,
diff --git a/hiera.yaml b/hiera.yaml
index 73a4e1ab8..58e53b7a3 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -1,10 +1,12 @@
 ---
-:backends:
-  - yaml
+version: 5
+defaults:
+  datadir: /vagrant/hiera
+  data_hash: yaml_data
 
-:yaml:
-  :datadir: /vagrant/hiera
+hierarchy:
+  - name: 'General build packages'
+    path: packages.yaml
 
-:hierarchy:
-  - packages
-  - settings
\ No newline at end of file
+  - name: 'General application settings'
+    path: settings.yaml
\ No newline at end of file