diff --git a/flash/FP5/flash_FP5_factory.sh b/flash/FP5/flash_FP5_factory.sh
index b4ae07f0508cd64ca6fcb0db98e8d923d1113683..facdbf3e849d951629b28a6b44cfacb32e4dea23 100755
--- a/flash/FP5/flash_FP5_factory.sh
+++ b/flash/FP5/flash_FP5_factory.sh
@@ -85,16 +85,16 @@ find_device() {
 # Flash (or manipulate) relevant partitions
 flash_device() {
 
-  flash_image_ab_or_abort "${sn}" bluetooth bluetooth.img
-  flash_image_ab_or_abort "${sn}" devcfg devcfg.img
-  flash_image_ab_or_abort "${sn}" dsp dsp.img
-  flash_image_ab_or_abort "${sn}" modem modem.img
-  flash_image_ab_or_abort "${sn}" xbl xbl.img
-  flash_image_ab_or_abort "${sn}" tz tz.img
-  flash_image_ab_or_abort "${sn}" hyp hyp.img
-  flash_image_ab_or_abort "${sn}" keymaster keymaster.img
-
-  flash_image_ab_or_abort "${sn}" abl abl.img
+  flash_image_ab_or_abort "${sn}" bluetooth "${IMAGES_DIR}/bluetooth.img"
+  flash_image_ab_or_abort "${sn}" devcfg "${IMAGES_DIR}/devcfg.img"
+  flash_image_ab_or_abort "${sn}" dsp "${IMAGES_DIR}/dsp.img"
+  flash_image_ab_or_abort "${sn}" modem "${IMAGES_DIR}/modem.img"
+  flash_image_ab_or_abort "${sn}" xbl "${IMAGES_DIR}/xbl.img"
+  flash_image_ab_or_abort "${sn}" tz "${IMAGES_DIR}/tz.img"
+  flash_image_ab_or_abort "${sn}" hyp "${IMAGES_DIR}/hyp.img"
+  flash_image_ab_or_abort "${sn}" keymaster "${IMAGES_DIR}/keymaster.img"
+
+  flash_image_ab_or_abort "${sn}" abl "${IMAGES_DIR}/abl.img"
   flash_image_ab_or_abort "${sn}" boot "${IMAGES_DIR}/boot.img"
   flash_image_ab_or_abort "${sn}" dtbo "${IMAGES_DIR}/dtbo.img"
   flash_image_ab_or_abort "${sn}" vendor_boot "${IMAGES_DIR}/vendor_boot.img"
@@ -102,16 +102,16 @@ flash_device() {
   flash_image_ab_or_abort "${sn}" vbmeta "${IMAGES_DIR}/vbmeta.img"
   flash_image_or_abort "${sn}" super "${IMAGES_DIR}/super.img"
 
-  flash_image_ab_or_abort "${sn}" aop aop.img
-  flash_image_ab_or_abort "${sn}" featenabler featenabler.img
-  flash_image_ab_or_abort "${sn}" imagefv imagefv.img
-  flash_image_ab_or_abort "${sn}" multiimgoem multiimgoem.img
-  flash_image_ab_or_abort "${sn}" qupfw qupfw.img
-  flash_image_ab_or_abort "${sn}" uefisecapp uefisecapp.img
-  flash_image_ab_or_abort "${sn}" xbl_config xbl_config.img
+  flash_image_ab_or_abort "${sn}" aop "${IMAGES_DIR}/aop.img"
+  flash_image_ab_or_abort "${sn}" featenabler "${IMAGES_DIR}/featenabler.img"
+  flash_image_ab_or_abort "${sn}" imagefv "${IMAGES_DIR}/imagefv.img"
+  flash_image_ab_or_abort "${sn}" multiimgoem "${IMAGES_DIR}/multiimgoem.img"
+  flash_image_ab_or_abort "${sn}" qupfw "${IMAGES_DIR}/qupfw.img"
+  flash_image_ab_or_abort "${sn}" uefisecapp "${IMAGES_DIR}/uefisecapp.img"
+  flash_image_ab_or_abort "${sn}" xbl_config "${IMAGES_DIR}/xbl_config.img"
 
-  flash_image_ab_or_abort "${sn}" cpucp cpucp.img
-  flash_image_ab_or_abort "${sn}" shrm shrm.img
+  flash_image_ab_or_abort "${sn}" cpucp "${IMAGES_DIR}/cpucp.img"
+  flash_image_ab_or_abort "${sn}" shrm "${IMAGES_DIR}/shrm.img"
 
   "$FASTBOOT_BIN" -s "${sn}" erase userdata
   "$FASTBOOT_BIN" -s "${sn}" erase metadata