diff --git a/hiera.yaml b/hiera.yaml
index 0b96d9cc..4dc952bd 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -1,16 +1,16 @@
 ---
 version: 4
 datadir: data
 hierarchy:
-  - name: "private/hostname/%{::fqdn}"
+  - name: "private/hostname/%{trusted.certname}"
     backend: yaml
   - name: "private/location/%{::location}"
     backend: yaml
   - name: "private/defaults"
     backend: yaml
-  - name: "hostname/%{::fqdn}"
+  - name: "hostname/%{trusted.certname}"
     backend: yaml
   - name: "location/%{::location}"
     backend: yaml
   - name: defaults
     backend: yaml