diff --git a/Dockerfile b/Dockerfile
index 8ad81bf8945d2755d1b56079ed168aa4c51932f4..095c31e682ae6ad8816d4b84dbb0c3db2a93a75f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -99,6 +99,7 @@ ENV RECOVERY_IMG false
 
 # Assume device does not use vendor_boot as recovery by default
 ENV VBOOT_IS_RECOVERY false
+
 # Ship with Minimal Apps
 ENV MINIMAL_APPS false
 
diff --git a/src/build.sh b/src/build.sh
index 5a20079292c3df8f73f1c1ea8049a87ee5c5904b..47e5c2ba9cd0c9624ce80b21cdd49954bcb55ce5 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -323,13 +323,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           RECOVERY_IMG_NAME="recovery-${build%.*}.img"
 
           if [ "$VBOOT_IS_RECOVERY" = true ]; then
-            cp -a vendor_boot.img "$RECOVERY_IMG_NAME"
-          else
-            if [ -f "recovery.img" ]; then
+            cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_boot.img "$RECOVERY_IMG_NAME"
+          elif [ -f "recovery.img" ]; then
               cp -a recovery.img "$RECOVERY_IMG_NAME"
-            else
+          else
               cp -a boot.img "$RECOVERY_IMG_NAME"
-            fi
           fi
 
           sha256sum "$RECOVERY_IMG_NAME" > "$RECOVERY_IMG_NAME.sha256sum"