diff --git a/src/build.sh b/src/build.sh
index f200399a62c57af756ab964ccac1fe2a1b599f56..b8ce8b5fa7f9e41fa35fb9b52169cc46a611c892 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -393,8 +393,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
         fi
         ota_from_target_files --backup=true "${SIGN_KEY[@]}" "$OUT/$TARGET_FILES" \
           "$OUT/$E_VERSION"
-        md5sum $OUT/$E_VERSION >$OUT/$E_VERSION.md5sum
-        sha256sum $OUT/$E_VERSION >$OUT/$E_VERSION.sha256sum
 
         if [ ! -f "$OUT/$E_VERSION" ]; then
           clean_up
@@ -467,8 +465,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           echo ">> [$(date)] Generating IMG zip"
           cd $OUT/IMG
           zip -r $OUT/$IMAGE_PACKAGE_NAME *
-          md5sum $OUT/$IMAGE_PACKAGE_NAME >$OUT/$IMAGE_PACKAGE_NAME.md5sum
-          sha256sum $OUT/$IMAGE_PACKAGE_NAME >$OUT/$IMAGE_PACKAGE_NAME.sha256sum
 
           rm -rf $OUT/IMG/bin-msys $OUT/IMG/bin-linux-x86 $OUT/IMG/flash_${DEVICE}_factory.sh $OUT/IMG/fastboot_update.zip
           cd "$source_dir"
@@ -487,11 +483,17 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           echo ">> [$(date)] Generating QFIL zip"
           cd $OUT/IMG
           zip -r $OUT/$QFIL_IMAGE_PACKAGE_NAME *
-          md5sum $OUT/$QFIL_IMAGE_PACKAGE_NAME >$OUT/$QFIL_IMAGE_PACKAGE_NAME.md5sum
-          sha256sum $OUT/$QFIL_IMAGE_PACKAGE_NAME >$OUT/$QFIL_IMAGE_PACKAGE_NAME.sha256sum
+
           cd "$source_dir"
         fi
 
+        cd $OUT
+        for PACKAGE_NAME in $(ls *${E_VERSION}); do
+          md5sum $PACKAGE_NAME >$PACKAGE_NAME.md5sum
+          sha256sum $PACKAGE_NAME >$PACKAGE_NAME.sha256sum
+        done
+        cd "$source_dir"
+
         rm -rf $OUT/IMG
         build_success=true
       else