diff --git a/data/os/CentOS.7.yaml b/data/os/CentOS.7.yaml
deleted file mode 100644
index 72b8ec1..0000000
--- a/data/os/CentOS.7.yaml
+++ /dev/null
@@ -1 +0,0 @@
-puppetboard::python_version: '3.6'
diff --git a/data/os/CentOS.8.yaml b/data/os/CentOS.8.yaml
deleted file mode 100644
index 9a5756d..0000000
--- a/data/os/CentOS.8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-puppetboard::python_version: '3.8'
diff --git a/hiera.yaml b/hiera.yaml
index 4a1d561..34767c6 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -5,6 +5,10 @@ defaults:
   data_hash: 'yaml_data'
 hierarchy:
   - name: 'Distribution name and major version'
-    path: "os/%{facts.os.name}.%{facts.os.release.major}.yaml"
+    paths:
+      - "os/%{facts.os.name}.%{facts.os.release.major}.yaml"
+      - "os/%{facts.os.family}.%{facts.os.release.major}.yaml"
   - name: 'Distribution family'
-    path: "os/%{facts.os.family}.yaml"
+    paths:
+      - "os/%{facts.os.name}.yaml"
+      - "os/%{facts.os.family}.yaml"
diff --git a/metadata.json b/metadata.json
index a2a9eaf..73187dc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -13,6 +13,18 @@
   ],
   "issues_url": "https://github.com/voxpupuli/puppet-puppetboard/issues",
   "operatingsystem_support": [
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "9"
+      ]
+    },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
@@ -27,6 +39,18 @@
         "13"
       ]
     },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "9"
+      ]
+    },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [