diff --git a/data/CentOS-7.yaml b/data/CentOS-7.yaml
deleted file mode 100644
index 888cb17..0000000
--- a/data/CentOS-7.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-systemd::accounting:
-  DefaultCPUAccounting: 'yes'
-  DefaultBlockIOAccounting: 'yes'
-  DefaultMemoryAccounting: 'yes'
-  DefaultTasksAccounting: 'yes'
diff --git a/data/CentOS-8.yaml b/data/CentOS-8.yaml
deleted file mode 100644
index c750d0e..0000000
--- a/data/CentOS-8.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-systemd::accounting:
-  DefaultCPUAccounting: 'yes'
-  DefaultBlockIOAccounting: 'yes'
-  DefaultMemoryAccounting: 'yes'
-  DefaultTasksAccounting: 'yes'
-  DefaultIOAccounting: 'yes'
-  DefaultIPAccounting: 'yes'
diff --git a/data/OracleLinux-7.yaml b/data/OracleLinux-7.yaml
deleted file mode 100644
index 888cb17..0000000
--- a/data/OracleLinux-7.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-systemd::accounting:
-  DefaultCPUAccounting: 'yes'
-  DefaultBlockIOAccounting: 'yes'
-  DefaultMemoryAccounting: 'yes'
-  DefaultTasksAccounting: 'yes'
diff --git a/data/OracleLinux-8.yaml b/data/OracleLinux-8.yaml
deleted file mode 100644
index 888cb17..0000000
--- a/data/OracleLinux-8.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-systemd::accounting:
-  DefaultCPUAccounting: 'yes'
-  DefaultBlockIOAccounting: 'yes'
-  DefaultMemoryAccounting: 'yes'
-  DefaultTasksAccounting: 'yes'
diff --git a/hiera.yaml b/hiera.yaml
index 1688d2a..218dcc6 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -1,12 +1,14 @@
 ---
 version: 5
 defaults:
   datadir: 'data'
   data_hash: 'yaml_data'
 hierarchy:
   - name: 'Major Version'
     path: '%{facts.os.name}-%{facts.os.release.major}.yaml'
   - name: 'Distribution Name'
     path: '%{facts.os.name}.yaml'
+  - name: 'OS Family Major Version'
+    path: '%{facts.os.family}-%{facts.os.release.major}.yaml'
   - name: 'common'
     path: 'common.yaml'