diff --git a/src/build.sh b/src/build.sh
index 2ded8122b516d4eee71dfb89d13419fee2d0983f..fe290576f0340ce648462487ab2a0d5933aad417 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -552,25 +552,34 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           cd $OUT/IMG
           zip -r $OUT/$IMAGE_PACKAGE_NAME *
 
-          rm -rf $OUT/IMG/bin-msys $OUT/IMG/bin-linux-x86 $OUT/IMG/bin-darwin $OUT/IMG/factory.common $OUT/IMG/flash_${DEVICE}_factory.sh $OUT/IMG/fastboot_update.zip
           cd "$source_dir"
+          rm -rf $OUT/IMG
         fi
 
         if [ -f "$QFIL_FLASH_PATH/${DEVICE}/configs/rawprogram0.xml" ] && [ ! -z "$QFIL_IMAGES" ]; then
+          # Create a temp folder for creating QFIL-e*
+          mkdir -p $OUT/QFIL
+
           # Copy required images for IMG-e*
           for IMAGE in $QFIL_IMAGES; do
-            cp $OUT/$IMAGE $OUT/IMG/$IMAGE
+            cp $OUT/$IMAGE $OUT/QFIL/$IMAGE
           done
 
-          cp -R $QFIL_FLASH_PATH/${DEVICE}/configs/* $OUT/IMG/
-          cp -R $QFIL_FLASH_PATH/${DEVICE}/prebuilts/* $OUT/IMG/
-          python2 $QFIL_FLASH_PATH/checksparse.py -i $OUT/IMG/rawprogram0.xml -s $OUT/IMG -t $OUT/IMG
+          # Copy required radio images for QFIL-e*
+          if [ -d "$IMG_FIRMWARE_PATH" ]; then
+            cp -rf "$IMG_FIRMWARE_PATH/"* $OUT/QFIL/
+          fi
+
+          cp -R $QFIL_FLASH_PATH/${DEVICE}/configs/* $OUT/QFIL/
+          cp -R $QFIL_FLASH_PATH/${DEVICE}/prebuilts/* $OUT/QFIL/
+          python2 $QFIL_FLASH_PATH/checksparse.py -i $OUT/QFIL/rawprogram0.xml -s $OUT/QFIL -t $OUT/QFIL
 
           echo ">> [$(date)] Generating QFIL zip"
-          cd $OUT/IMG
+          cd $OUT/QFIL
           zip -r $OUT/$QFIL_IMAGE_PACKAGE_NAME *
 
           cd "$source_dir"
+          rm -rf $OUT/QFIL
         fi
 
         cd $OUT
@@ -580,7 +589,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
         done
         cd "$source_dir"
 
-        rm -rf $OUT/IMG
         build_success=true
       else
         echo ">> [$(date)] Unable to find $TARGET_FILES"