diff --git a/data/defaults.yaml b/data/common/common.yaml
rename from data/defaults.yaml
rename to data/common/common.yaml
--- a/data/defaults.yaml
+++ b/data/common/common.yaml
@@ -1,5 +1,5 @@
 ---
-### See also defaults_security.yaml for public key/cert fingerprint blocks
+### See also public_keys.yaml for public key/cert fingerprint blocks
 ###
 
 dns::local_cache: true
diff --git a/data/defaults_security.yaml b/data/common/public_keys.yaml
rename from data/defaults_security.yaml
rename to data/common/public_keys.yaml
diff --git a/hiera.yaml b/hiera.yaml
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -14,7 +14,5 @@
     name: "Per hostname override configuration"
   - path: "location/%{::location}.yaml"
     name: "Per location override configuration"
-  - path: "defaults_security.yaml"
-    name: "Public keys configuration"
-  - path: "defaults.yaml"
-    name: "Main default configuration"
+  - glob: "common/*.yaml"
+    name: "Common settings"