diff --git a/debian/changelog b/debian/changelog
index abb772ce..c549581a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (25.04.10) plucky; urgency=medium
+
+  * riscv: copy device trees to the ESP. Fixes (LP: #2095415)
+
+ -- Adriano Cordova <adriano.cordova@canonical.com>  Tue, 21 Jan 2025 10:38:54 -0300
+
 livecd-rootfs (25.04.9) plucky; urgency=medium
 
   * Move reference wsl-setup script to /usr/lib/wsl/
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
index 7060a7aa..91671735 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
@@ -365,7 +365,7 @@ EOF
                     "mountpoint/usr/lib/linux-image-$kver"
                     "mountpoint/lib/firmware/$kver/device-tree"
                 )
-                dtb_tgt_dir="mountpoint/boot/dtbs/$kver/"
+                dtb_tgt_dir="mountpoint/boot/efi/dtbs/"
                 mkdir -p "$dtb_tgt_dir"
                 for src_dir in "${dtb_src_dirs[@]}"; do
                     [ -d "$src_dir" ] && cp -r -v "$src_dir"/* "$dtb_tgt_dir" || echo "Skipping missing: $src_dir"