diff --git a/.github/workflows/hi3516cv300_ultimate_images.yml b/.github/workflows/hi3516cv300_ultimate_images.yml
index c6c11e3a..034ca767 100644
--- a/.github/workflows/hi3516cv300_ultimate_images.yml
+++ b/.github/workflows/hi3516cv300_ultimate_images.yml
@@ -73,17 +73,16 @@ jobs:
           [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) -gt 3145728 ]] && echo "TG_NOTIFY=Warning, kernel size exceeded : $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) ... ${BOARD} (ultimate)" >> $GITHUB_ENV && exit 1
           [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) -gt 10485760 ]] && echo "TG_NOTIFY=Warning, rootfs size exceeded - $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) vs 10485760... ${BOARD} (ultimate)" >> $GITHUB_ENV && exit 1
           cd ${GITHUB_WORKSPACE}/output/images
-          cp uImage uImage.${BOARD}-nand
-          mv uImage uImage.${BOARD}-ultimate
-          mv rootfs.squashfs rootfs.squashfs.${BOARD}-ultimate
-          mv rootfs.ubi rootfs.ubi.${BOARD}-nand
-          mv rootfs.ubifs rootfs.ubifs.${BOARD}-nand
-          md5sum rootfs.squashfs.${BOARD}-ultimate > rootfs.squashfs.${BOARD}-ultimate.md5sum
-          md5sum uImage.${BOARD}-ultimate > uImage.${BOARD}-ultimate.md5sum
-          md5sum rootfs.ubifs.${BOARD}-nand > rootfs.ubifs.${BOARD}-nand.md5sum
-          md5sum uImage.${BOARD}-ultimate > uImage.${BOARD}-nand.md5sum
-          tar -cvzf $ARCHIVE_FW *${BOARD}-ultimate*
-          tar -cvzf $ARCHIVE_FW_NAND *${BOARD}-nand*
+          mv uImage uImage.${BOARD}
+          mv rootfs.squashfs rootfs.squashfs.${BOARD}
+          mv rootfs.ubi rootfs.ubi.${BOARD}
+          mv rootfs.ubifs rootfs.ubifs.${BOARD}
+          md5sum rootfs.squashfs.${BOARD} > rootfs.squashfs.${BOARD}.md5sum
+          md5sum uImage.${BOARD} > uImage.${BOARD}.md5sum
+          md5sum rootfs.ubifs.${BOARD} > rootfs.ubifs.${BOARD}.md5sum
+          md5sum uImage.${BOARD} > uImage.${BOARD}.md5sum
+          tar -cvzf $ARCHIVE_FW uImage* *rootfs.squashfs.${BOARD}*
+          tar -cvzf $ARCHIVE_FW_NAND uImage* *rootfs.ubi*.${BOARD}*
 
       - name: Send warning message to telegram channel
         env:
diff --git a/.github/workflows/hi3516ev200_ultimate_images.yml b/.github/workflows/hi3516ev200_ultimate_images.yml
index 8d5d6e02..f50f9f4a 100644
--- a/.github/workflows/hi3516ev200_ultimate_images.yml
+++ b/.github/workflows/hi3516ev200_ultimate_images.yml
@@ -73,17 +73,16 @@ jobs:
           [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) -gt 3145728 ]] && echo "TG_NOTIFY=Warning, kernel size exceeded : $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) ... ${BOARD} (ultimate)" >> $GITHUB_ENV && exit 1
           [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) -gt 10485760 ]] && echo "TG_NOTIFY=Warning, rootfs size exceeded - $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) vs 10485760... ${BOARD} (ultimate)" >> $GITHUB_ENV && exit 1
           cd ${GITHUB_WORKSPACE}/output/images
-          cp uImage uImage.${BOARD}-nand
-          mv uImage uImage.${BOARD}-ultimate
-          mv rootfs.squashfs rootfs.squashfs.${BOARD}-ultimate
-          mv rootfs.ubi rootfs.ubi.${BOARD}-nand
-          mv rootfs.ubifs rootfs.ubifs.${BOARD}-nand
-          md5sum rootfs.squashfs.${BOARD}-ultimate > rootfs.squashfs.${BOARD}-ultimate.md5sum
-          md5sum uImage.${BOARD}-ultimate > uImage.${BOARD}-ultimate.md5sum
-          md5sum rootfs.ubifs.${BOARD}-nand > rootfs.ubifs.${BOARD}-nand.md5sum
-          md5sum uImage.${BOARD}-ultimate > uImage.${BOARD}-nand.md5sum
-          tar -cvzf $ARCHIVE_FW *${BOARD}-ultimate*
-          tar -cvzf $ARCHIVE_FW_NAND *${BOARD}-nand*
+          mv uImage uImage.${BOARD}
+          mv rootfs.squashfs rootfs.squashfs.${BOARD}
+          mv rootfs.ubi rootfs.ubi.${BOARD}
+          mv rootfs.ubifs rootfs.ubifs.${BOARD}
+          md5sum rootfs.squashfs.${BOARD} > rootfs.squashfs.${BOARD}.md5sum
+          md5sum uImage.${BOARD} > uImage.${BOARD}.md5sum
+          md5sum rootfs.ubifs.${BOARD} > rootfs.ubifs.${BOARD}.md5sum
+          md5sum uImage.${BOARD} > uImage.${BOARD}.md5sum
+          tar -cvzf $ARCHIVE_FW uImage* *rootfs.squashfs.${BOARD}*
+          tar -cvzf $ARCHIVE_FW_NAND uImage* *rootfs.ubi*.${BOARD}*
 
       - name: Send warning message to telegram channel
         env: