diff --git a/data/Ubuntu-22.04.yaml b/data/Ubuntu-22.04.yaml
deleted file mode 100644
index fda37e3c..00000000
--- a/data/Ubuntu-22.04.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-systemd::accounting:
-  DefaultCPUAccounting: 'yes'
-  DefaultIOAccounting: 'yes'
-  DefaultIPAccounting: 'yes'
-  DefaultBlockIOAccounting: 'yes'
-  DefaultMemoryAccounting: 'yes'
-  DefaultTasksAccounting: 'yes'
-
-systemd::timesyncd_package: 'systemd-timesyncd'
diff --git a/data/Ubuntu-20.04.yaml b/data/Ubuntu.yaml
similarity index 100%
rename from data/Ubuntu-20.04.yaml
rename to data/Ubuntu.yaml
diff --git a/metadata.json b/metadata.json
index 3763157c..aa92784b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -29,7 +29,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "20.04",
-        "22.04"
+        "22.04",
+        "24.04"
       ]
     },
     {
@@ -92,7 +93,8 @@
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
         "37",
-        "38"
+        "38",
+        "40"
       ]
     }
   ],