diff --git a/data/os/Fedora/29.yaml b/data/os/Fedora.yaml
similarity index 100%
rename from data/os/Fedora/29.yaml
rename to data/os/Fedora.yaml
diff --git a/data/os/Fedora/30.yaml b/data/os/Fedora/30.yaml
deleted file mode 100644
index b2bc628..0000000
--- a/data/os/Fedora/30.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-letsencrypt::configure_epel: false
-letsencrypt::plugin::dns_rfc2136::package_name: 'python3-certbot-dns-rfc2136'
diff --git a/hiera.yaml b/hiera.yaml
index 8f3b44b..2058ed6 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -1,16 +1,19 @@
 ---
 version: 5
 
 defaults:
   datadir: 'data'
   data_hash: 'yaml_data'
 
 hierarchy:
   - name: 'Operating System Major Release'
     path: 'os/%{facts.os.name}/%{facts.os.release.major}.yaml'
 
+  - name: 'Operating System'
+    path: 'os/%{facts.os.name}.yaml'
+
   - name: 'Operating System Family'
     path: '%{facts.os.family}-family.yaml'
 
   - name: 'common'
     path: 'common.yaml'