diff --git a/manifests/site.pp b/manifests/site.pp
index cc02727..5ba0af4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,7 +41,7 @@ node default {
   #incude a role on any node that specifies it's role via a trusted fact at provision time
   #https://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html#trusted-facts
   #https://docs.puppetlabs.com/puppet/latest/reference/ssl_attributes_extensions.html#aws-attributes-and-extensions-population-example
-  include $trusted['extensions']['pp_role']
+  include "role::${trusted['extensions']['pp_role']}"
 
   # This is where you can declare classes for all nodes.
   # Example:
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
index 8242110..b22500c 100644
--- a/site/profile/manifests/puppetmaster.pp
+++ b/site/profile/manifests/puppetmaster.pp
@@ -2,11 +2,11 @@ class profile::puppetmaster {
 
   class { 'hiera':
     hierarchy  => [
-      "nodes/%{::trusted.certname}",
-      :common",
+      "\"nodes/%{::trusted.certname}\"",
+      "common",
     ],
     hiera_yaml => '/etc/puppetlabs/code/hiera.yaml',
-    datadir    => "/etc/puppetlabs/code/environments/%{environment}/hieradata",
+    datadir    => "\"/etc/puppetlabs/code/environments/%{environment}/hieradata\"",
     owner      => 'root',
     group      => 'root',
   }