diff --git a/src/build.sh b/src/build.sh
index 3dd712011ee43a3076fae1ff615f6175ce46bb30..209156db162f69e375ed72d2736c98ea72ce06aa 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -482,12 +482,16 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
         done
 
         IMG_FLASH_PATH="$source_dir/vendor/eos/flash"
-        IMG_FIRMWARE_PATH="$source_dir/vendor/firmware"
+        IMG_FIRMWARE_PATH="$source_dir/vendor/firmware/${DEVICE}/radio"
         QFIL_FLASH_PATH="$source_dir/vendor/murena-flash"
 
-        if [ ! -d "$IMG_FIRMWARE_PATH/${DEVICE}/radio" ]; then
+        if [ ! -d "$IMG_FIRMWARE_PATH" ]; then
           # If it doesn't exist, use an alternative path, used in lineage-21
-          IMG_FIRMWARE_PATH="$source_dir/$(dirname vendor/*/${DEVICE})"
+          IMG_FIRMWARE_VENDOR_PATH=$(repo list | grep "proprietary_vendor_.*_${DEVICE}" | cut  -d : -f 1 | xargs)
+          if [ -n "$IMG_FIRMWARE_VENDOR_PATH" ] &&  [ -d "$source_dir/$IMG_FIRMWARE_VENDOR_PATH" ]; then
+             IMG_FIRMWARE_PATH="$source_dir/$IMG_FIRMWARE_VENDOR_PATH/radio"
+             echo ">> INFO: \$IMG_FIRMWARE_PATH: $IMG_FIRMWARE_PATH"
+          fi
         fi
 
         QFIL_CONFIG=$QFIL_FLASH_PATH/${DEVICE}/config.mk
@@ -521,8 +525,8 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           done
 
           # Copy required images for IMG-e*
-          if [ -d "$IMG_FIRMWARE_PATH/${DEVICE}/radio" ]; then
-            cp -rf "$IMG_FIRMWARE_PATH/${DEVICE}/radio/"* $OUT/IMG/
+          if [ -d "$IMG_FIRMWARE_PATH" ]; then
+            cp -rf "$IMG_FIRMWARE_PATH/"* $OUT/IMG/
           fi
 
           # Copy required fastboot tools for IMG-e*