diff --git a/modules/openstack_project/files/puppetmaster/hiera.yaml b/modules/openstack_project/files/puppetmaster/hiera.yaml
index f039df5647..d97f36acd7 100644
--- a/modules/openstack_project/files/puppetmaster/hiera.yaml
+++ b/modules/openstack_project/files/puppetmaster/hiera.yaml
@@ -1,16 +1,29 @@
 ---
 :hierarchy:
-  - fqdn/"%{::fqdn}"
-  - group/"%{group}" # no :: because group is set at nodescope
-  - common
+  # Use private hieradata first
+  - "hieradata/%{::environment}/fqdn/%{::fqdn}"
+  - "hieradata/%{::environment}/group/%{group}" # no :: because group is set at nodescope
+  - "hieradata/%{::environment}/common"
+  # Use public hieradata second, also be environmentally aware
+  - "%{::environment}/hiera/fqdn/%{::fqdn}"
+  - "%{::environment}/hiera/group/%{group}" # no :: because group is set at nodescope
+  - "%{::environment}/hiera/common"
 :backends:
   - yaml
 :yaml:
-  :datadir: "/etc/puppet/hieradata/%{environment}"
+  :datadir: "/opt/system-config/"
 
 
-# File directory structure
-# /etc/puppet/hieradata/production/
-# /etc/puppet/hieradata/production/fqdn/afs01.openstack.org.yaml  #highest priority
-# /etc/puppet/hieradata/production/group/afs.yaml                 #middle priority
-# /etc/puppet/hieradata/production/common.yaml                    #lowest priority
+# File directory structure:
+# Secret data:
+# /opt/system-config/hieradata/
+# /opt/system-config/hieradata/production
+# /opt/system-config/hieradata/production/fqdn/afs01.openstack.org.yaml  #highest priority
+# /opt/system-config/hieradata/production/group/afs.yaml                 #middle priority
+# /opt/system-config/hieradata/production/common.yaml                    #lowest priority
+# Public data
+# /opt/system-config/production
+# /opt/system-config/production/hiera/fqdn/afs01.openstack.org.yaml #highest priority
+# /opt/system-config/production/hiera/group/afs.yaml                #middle priority
+# /opt/system-config/production/hiera/common.yaml                   #lowest priority
+