diff --git a/defaults/main.yml b/defaults/main.yml
index 0725c70..d8c426d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,5 +12,5 @@ puppet_data_binding_terminus: hiera
 puppet_reports: store
 puppet_basemodulepath: '$confdir/modules:/opt/system-config/production/modules'
 puppet_environmentpath: '$confdir/environments'
-puppet_hiera_datadir: '/etc/puppet/hieradata'
+puppet_hiera_datadir: '/opt/system-config/'
 puppet_environment: production
diff --git a/templates/hiera.yaml.j2 b/templates/hiera.yaml.j2
index 24601bb..f2f9b13 100644
--- a/templates/hiera.yaml.j2
+++ b/templates/hiera.yaml.j2
@@ -5,9 +5,9 @@
   - "hieradata/%{::environment}/group/%{group}" # no :: because group is set at nodescope
   - "hieradata/%{::environment}/common"
   # Use public hieradata second, also be environmentally aware
-  - "%{::environment}/fqdn/%{::fqdn}"
-  - "%{::environment}/group/%{group}" # no :: because group is set at nodescope
-  - "%{::environment}/common"
+  - "%{::environment}/hiera/fqdn/%{::fqdn}"
+  - "%{::environment}/hiera/group/%{group}" # no :: because group is set at nodescope
+  - "%{::environment}/hiera/common"
 :backends:
   - yaml
 :yaml: