diff --git a/Dockerfile b/Dockerfile
index d9e506394b63d6fd41d5ffb69d6bb3b90699712b..5620795b1860734c669d130aaf763e6633b1fb59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -100,6 +100,9 @@ ENV RECOVERY_IMG false
 # Assume device does not use vendor_boot as recovery by default
 ENV VBOOT_IS_RECOVERY false
 
+# Assume device does not need additional files for recovery to boot.
+ENV RECOVERY_NEEDS_SUPPORT_IMG false
+
 # Ship with Minimal Apps
 ENV MINIMAL_APPS false
 
diff --git a/src/build.sh b/src/build.sh
index a3848a5465628a3556caaff1b0a3ba77f2132119..8e697742487518fd822ee1a890df993448f537e0 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -325,6 +325,17 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
         if [ "$RECOVERY_IMG" = true ]; then
 
           RECOVERY_IMG_NAME="recovery-${build%.*}.img"
+          VENDOR_BOOT_IMG_NAME="vendor_boot-${build%.*}.img"
+          DTBO_IMG_NAME="dtbo-${build%.*}.img"
+
+          if [ "$RECOVERY_NEEDS_SUPPORT_IMG" = true ]; then
+            cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_boot.img "$VENDOR_BOOT_IMG_NAME"
+            cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/dtbo.img "$DTBO_IMG_NAME"
+            sha256sum "$VENDOR_BOOT_IMG_NAME" > "$VENDOR_BOOT_IMG_NAME.sha256sum"
+            sha256sum "$DTBO_IMG_NAME" > "$DTBO_IMG_NAME.sha256sum"
+            mv "$VENDOR_BOOT_IMG_NAME"* "$ZIP_DIR/$zipsubdir/"
+            mv "$DTBO_IMG_NAME"* "$ZIP_DIR/$zipsubdir/"
+          fi
 
           if [ "$VBOOT_IS_RECOVERY" = true ]; then
             cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_boot.img "$RECOVERY_IMG_NAME"