diff --git a/data/os/Debian/Debian/10.yaml b/data/os/Debian/Debian/10.yaml
deleted file mode 100644
index f5f04de..0000000
--- a/data/os/Debian/Debian/10.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-nextcloud::php_version: "7.3"
diff --git a/data/os/Debian/Debian/11.yaml b/data/os/Debian/Debian/11.yaml
deleted file mode 100644
index e71115d..0000000
--- a/data/os/Debian/Debian/11.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-nextcloud::php_version: "7.4"
diff --git a/data/os/Debian/Ubuntu/18.04.yaml b/data/os/Debian/Debian/13.yaml
similarity index 54%
rename from data/os/Debian/Ubuntu/18.04.yaml
rename to data/os/Debian/Debian/13.yaml
index 3707f93..a412e53 100644
--- a/data/os/Debian/Ubuntu/18.04.yaml
+++ b/data/os/Debian/Debian/13.yaml
@@ -1,3 +1,3 @@
 ---
-nextcloud::php_version: "7.2"
-nextcloud::dependencies::libmagickcore_extra_package_name: "libmagickcore-6.q16-3-extra"
+nextcloud::dependencies::libmagickcore_extra_package_name: "libmagickcore-7.q16-10-extra"
+nextcloud::php_version: "8.4"
diff --git a/data/os/Debian/Debian/9.yaml b/data/os/Debian/Debian/9.yaml
deleted file mode 100644
index e0ccefa..0000000
--- a/data/os/Debian/Debian/9.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-nextcloud::php_version: "7.0"
diff --git a/metadata.json b/metadata.json
index 836c83e..5700e53 100644
--- a/metadata.json
+++ b/metadata.json
@@ -23,15 +23,13 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10",
-        "11",
-        "12"
+        "12",
+        "13"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04",
         "20.04",
         "22.04"
       ]