diff --git a/overlays/firmware-extended/24-moonraker-patches/patches/01-add-oem-disk-usage-support.patch b/overlays/firmware-extended/24-moonraker-patches/patches/home/lava/moonraker/01-add-oem-disk-usage-support.patch
similarity index 88%
rename from overlays/firmware-extended/24-moonraker-patches/patches/01-add-oem-disk-usage-support.patch
rename to overlays/firmware-extended/24-moonraker-patches/patches/home/lava/moonraker/01-add-oem-disk-usage-support.patch
index 2f5c6922..671a1d9a 100644
--- a/overlays/firmware-extended/24-moonraker-patches/patches/01-add-oem-disk-usage-support.patch
+++ b/overlays/firmware-extended/24-moonraker-patches/patches/home/lava/moonraker/01-add-oem-disk-usage-support.patch
@@ -1,5 +1,5 @@
---- a/home/lava/moonraker/moonraker/components/file_manager/file_manager.py	2026-02-06 19:12:24.179575409 +0100
-+++ b/home/lava/moonraker/moonraker/components/file_manager/file_manager.py	2026-02-06 19:13:16.448036223 +0100
+--- a/moonraker/components/file_manager/file_manager.py	2026-02-06 19:12:24.179575409 +0100
++++ b/moonraker/components/file_manager/file_manager.py	2026-02-06 19:13:16.448036223 +0100
 @@ -825,10 +825,12 @@
              }
              flist['disk_usage'] = disk_usage
diff --git a/overlays/firmware-extended/24-moonraker-patches/patches/home/lava/moonraker/02-metadata-filament_name-and-filament_type-as-array.patch b/overlays/firmware-extended/24-moonraker-patches/patches/home/lava/moonraker/02-metadata-filament_name-and-filament_type-as-array.patch
new file mode 100644
index 00000000..ced1c86b
--- /dev/null
+++ b/overlays/firmware-extended/24-moonraker-patches/patches/home/lava/moonraker/02-metadata-filament_name-and-filament_type-as-array.patch
@@ -0,0 +1,45 @@
+From 3a54161ce7d274c9dfe70205c2747c97f1eb3294 Mon Sep 17 00:00:00 2001
+From: Pedro Lamas <pedrolamas@gmail.com>
+Date: Wed, 12 Mar 2025 18:19:59 +0000
+Subject: [PATCH] metadata: filament_name and filament_type as array
+
+Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
+---
+ moonraker/components/file_manager/metadata.py | 20 +++++++++++++-------
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/moonraker/components/file_manager/metadata.py b/moonraker/components/file_manager/metadata.py
+--- a/moonraker/components/file_manager/metadata.py
++++ b/moonraker/components/file_manager/metadata.py
+@@ -435,6 +435,13 @@ def parse_filament_weight_total(self) -> Optional[float]:
+         )
+
+     def parse_filament_type(self) -> Optional[str]:
+-        return regex_find_string(r";\sfilament_type\s=\s(%S)", self.footer_data)
++        result = regex_find_strings(
++            r";\sfilament_type\s=\s(%S)", ",;", self.footer_data
++        )
++        if len(result) > 1:
++            return json.dumps(result)
++        elif result:
++            return result[0]
++        return None
+
+     def parse_filament_retract_length_toolchange(self) -> Optional[List[float]]:
+@@ -457,8 +464,13 @@ def parse_filament_retract_length_toolchange(self) -> Optional[List[float]]:
+         return []
+
+     def parse_filament_name(self) -> Optional[str]:
+-        return regex_find_string(
+-            r";\sfilament_settings_id\s=\s(%S)", self.footer_data
+-        )
++        result = regex_find_strings(
++            r";\sfilament_settings_id\s=\s(%S)", ",;", self.footer_data
++        )
++        if len(result) > 1:
++            return json.dumps(result)
++        elif result:
++            return result[0]
++        return None
+
+     def parse_estimated_time(self) -> Optional[float]: