diff --git a/0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch b/0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch
new file mode 100644
index 0000000000000000000000000000000000000000..878c8f7e51bc69e6e2ce8b4b873590fc1deccdfb
--- /dev/null
+++ b/0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch
@@ -0,0 +1,33 @@
+From 8843eab5ae826bd0229bb73a00f3041e892e81de Mon Sep 17 00:00:00 2001
+From: Li Ping <1477412247@qq.com>
+Date: Sat, 22 Feb 2025 02:17:52 +0000
+Subject: [PATCH] Fixes boot failure caused by invalid volume IDs
+
+---
+ isomaker/iso.sh | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/isomaker/iso.sh b/isomaker/iso.sh
+index 2bb52ac..3fbed91 100755
+--- a/isomaker/iso.sh
++++ b/isomaker/iso.sh
+@@ -351,12 +351,13 @@ function gen_devstation_iso()
+     [ $? != 0  ] && return 1
+     cd ${work_dir}/*/images
+     DEVSTATION_LIVECD_TAR=$(ls *.iso)
+-    mkdir -p iso && mount "$DEVSTATION_LIVECD_TAR" iso && cp -rf iso/* "${BUILD}"/iso && umount iso
++    volume_id=$(isoinfo -d -i "$DEVSTATION_LIVECD_TAR" | grep "Volume id" | awk '{print $NF}')
++    mkdir -p iso && mount "$DEVSTATION_LIVECD_TAR" iso && cp -rf iso/* "${BUILD}"/iso && sed -i '/menuentry/{s/-netinst//g}' "${BUILD}"/iso/EFI/BOOT/grub.cfg && umount iso
+     if [ "$ARCH" == "x86_64" ]; then
+-        mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DEVSTATION_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
++        mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${volume_id}" -o "${OUTPUT_DIR}/${DEVSTATION_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
+         [ $? != 0 ] && return 1
+     elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then
+-        mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DEVSTATION_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
++        mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${volume_id}" -o "${OUTPUT_DIR}/${DEVSTATION_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
+         [ $? != 0 ] && return 1
+     fi
+     implantisomd5 "${OUTPUT_DIR}/${DEVSTATION_ISO_NAME}"
+-- 
+2.46.0
+
diff --git a/devstation_aarch64_rpmlist b/devstation_aarch64_rpmlist
index 7fffa1c7f855201bbd2b14addcce2d82c732151d..31f71acf7902d0eb96c9b037de15c60cc0bc5ccc 100644
--- a/devstation_aarch64_rpmlist
+++ b/devstation_aarch64_rpmlist
@@ -39,7 +39,42 @@ gnome-session
 gnome-shell
 gnome-software
 gnome-terminal
-google-*-fonts
+google-droid-sans-fonts
+google-noto-fonts-common
+google-noto-sans-arabic-vf-fonts
+google-noto-sans-armenian-vf-fonts
+google-noto-sans-bengali-vf-fonts
+google-noto-sans-canadian-aboriginal-vf-fonts
+google-noto-sans-cherokee-vf-fonts
+google-noto-sans-devanagari-vf-fonts
+google-noto-sans-ethiopic-vf-fonts
+google-noto-sans-georgian-vf-fonts
+google-noto-sans-hebrew-vf-fonts
+google-noto-sans-kannada-vf-fonts
+google-noto-sans-khmer-vf-fonts
+google-noto-sans-lao-vf-fonts
+google-noto-sans-math-fonts
+google-noto-sans-mono-vf-fonts
+google-noto-sans-sinhala-vf-fonts
+google-noto-sans-symbols2-fonts
+google-noto-sans-symbols-vf-fonts
+google-noto-sans-tamil-vf-fonts
+google-noto-sans-thaana-vf-fonts
+google-noto-sans-thai-vf-fonts
+google-noto-sans-vf-fonts
+google-noto-serif-armenian-vf-fonts
+google-noto-serif-ethiopic-vf-fonts
+google-noto-serif-georgian-vf-fonts
+google-noto-serif-gujarati-vf-fonts
+google-noto-serif-gurmukhi-vf-fonts
+google-noto-serif-hebrew-vf-fonts
+google-noto-serif-kannada-vf-fonts
+google-noto-serif-khmer-vf-fonts
+google-noto-serif-lao-vf-fonts
+google-noto-serif-sinhala-vf-fonts
+google-noto-serif-tamil-vf-fonts
+google-noto-serif-thai-vf-fonts
+google-noto-serif-vf-fonts
 grub2
 grub2-efi
 grub2-efi-aa64-cdboot
diff --git a/devstation_x86_64_rpmlist b/devstation_x86_64_rpmlist
index 6df3830a74832d36b6e12b6808381385b00db158..7d32f61755ba85690be3a47d81819a17abc7c70b 100644
--- a/devstation_x86_64_rpmlist
+++ b/devstation_x86_64_rpmlist
@@ -44,7 +44,42 @@ gnome-session
 gnome-shell
 gnome-software
 gnome-terminal
-google-*-fonts
+google-droid-sans-fonts
+google-noto-fonts-common
+google-noto-sans-arabic-vf-fonts
+google-noto-sans-armenian-vf-fonts
+google-noto-sans-bengali-vf-fonts
+google-noto-sans-canadian-aboriginal-vf-fonts
+google-noto-sans-cherokee-vf-fonts
+google-noto-sans-devanagari-vf-fonts
+google-noto-sans-ethiopic-vf-fonts
+google-noto-sans-georgian-vf-fonts
+google-noto-sans-hebrew-vf-fonts
+google-noto-sans-kannada-vf-fonts
+google-noto-sans-khmer-vf-fonts
+google-noto-sans-lao-vf-fonts
+google-noto-sans-math-fonts
+google-noto-sans-mono-vf-fonts
+google-noto-sans-sinhala-vf-fonts
+google-noto-sans-symbols2-fonts
+google-noto-sans-symbols-vf-fonts
+google-noto-sans-tamil-vf-fonts
+google-noto-sans-thaana-vf-fonts
+google-noto-sans-thai-vf-fonts
+google-noto-sans-vf-fonts
+google-noto-serif-armenian-vf-fonts
+google-noto-serif-ethiopic-vf-fonts
+google-noto-serif-georgian-vf-fonts
+google-noto-serif-gujarati-vf-fonts
+google-noto-serif-gurmukhi-vf-fonts
+google-noto-serif-hebrew-vf-fonts
+google-noto-serif-kannada-vf-fonts
+google-noto-serif-khmer-vf-fonts
+google-noto-serif-lao-vf-fonts
+google-noto-serif-sinhala-vf-fonts
+google-noto-serif-tamil-vf-fonts
+google-noto-serif-thai-vf-fonts
+google-noto-serif-vf-fonts
 grub2
 grub2-efi-ia32-cdboot
 grub2-efi-x64
diff --git a/oemaker.spec b/oemaker.spec
index 9603ee51bce0e99ef16d887b00f07742d7f83342..978353c2a7f1cd9e862af5d3fe94d4408e0d67be 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -15,7 +15,7 @@ Summary:        a building tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        3.3.0
-Release:        4
+Release:        5
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -43,6 +43,7 @@ Requires:       xorriso
 # Patch here
 Patch0001:      0001-bugfix-IABY7K.patch
 Patch0002:      0001-fix-livecd-grub2-efi.cfg-not-found.patch
+Patch0003:      0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch
 
 %description
 a building tool for DVD ISO making and ISO cutting
@@ -223,7 +224,13 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
-* Wed Feb 12 2025 sunhai <sunhai@huawei.com> - 3.2.0-4
+* Mon Feb 24 2025 Li Ping <1477412247@qq.com> - 3.3.0-5
+- ID:NA
+- SUG:NA
+- DESC: Fix boot failure caused by invalid volume IDs
+
+
+* Wed Feb 12 2025 sunhai <sunhai@huawei.com> - 3.3.0-4
 - ID:NA
 - SUG:NA
 - DESC: enable encrypt need install systemd-cryptsetup package