diff --git a/hiera.yaml b/hiera.yaml
index 1ce9330..80d14c9 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -2,8 +2,7 @@
 :backends:
   - yaml
 :hierarchy:
-  - "%{clientcert}"
-  - "%{application_tier}"
+  - "nodes/%{clientcert}"
   - defaults
 
 :yaml: