diff --git a/hiera.yaml b/hiera.yaml
index 33e0514..bd0ea39 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -4,7 +4,8 @@
 
 :hierarchy:
   - "%{clientcert}"
-  - defaults
+  - "osfamily/%{::osfamily}"
+  - common
 
 :yaml:
   :datadir: /etc/puppet/code/hiera
diff --git a/hieradata/defaults.yaml b/hieradata/common.yaml
similarity index 97%
rename from hieradata/defaults.yaml
rename to hieradata/common.yaml
index 6d44d0d..46211c1 100644
--- a/hieradata/defaults.yaml
+++ b/hieradata/common.yaml
@@ -70,3 +70,6 @@ sshkeys::users:
     home: /home/rhizomatica
     keys:
       - test
+
+rhizo::dev_host_key: "NULL"
+rhizo::bsc_dev_deploy_key: "NULL"