diff --git a/image_to_usb.sh b/image_to_usb.sh
index a2fb466221..737908e3de 100755
--- a/image_to_usb.sh
+++ b/image_to_usb.sh
@@ -114,10 +114,7 @@ fi
 
 # We have a board name but no image set.  Use image at default location
 if [ -z "${FLAGS_from}" ]; then
-  IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images/${FLAGS_board}"
-
-  # Get latest image directory
-  FLAGS_from="${IMAGES_DIR}/$(ls -t ${IMAGES_DIR} 2>&-| head -1)"
+  FLAGS_from="$($SCRIPT_ROOT/get_latest_image.sh --board=${FLAGS_board})"
 fi
 
 if [ ! -d "${FLAGS_from}" ] ; then
diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh
index 5ca377ee08..ce6e771c9d 100755
--- a/mod_image_for_recovery.sh
+++ b/mod_image_for_recovery.sh
@@ -70,11 +70,10 @@ fi
 
 EMERGE_BOARD_CMD="emerge-$BOARD"
 
-# We have a board name but no image set.  Use image at default location
+# No image was provided.  Use the standard latest image
 if [ -z "$FLAGS_image" ]; then
-  IMAGES_DIR="$DEFAULT_BUILD_ROOT/images/$BOARD"
-  FILENAME="$CHROMEOS_IMAGE_NAME"
-  FLAGS_image="$IMAGES_DIR/$(ls -t $IMAGES_DIR 2>&-| head -1)/$FILENAME"
+  IMAGES_DIR="$($SCRIPT_ROOT/get_latest_image.sh --board=$BOARD)"
+  FLAGS_image="$IMAGES_DIR/$CHROMEOS_IMAGE_NAME"
 fi
 
 # Turn path into an absolute path.
diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh
index e6e4801662..deae540297 100755
--- a/mod_image_for_test.sh
+++ b/mod_image_for_test.sh
@@ -52,17 +52,15 @@ set -e
 . "${BUILD_LIBRARY_DIR}/test_image_util.sh" || exit 1
 
 
-# We have a board name but no image set.  Use image at default location
+# No image was provided.  Use the standard latest image
 if [ -z "$FLAGS_image" ]; then
-  IMAGES_DIR="$DEFAULT_BUILD_ROOT/images/$BOARD"
-  FILENAME="$CHROMEOS_IMAGE_NAME"
-  FLAGS_image="$IMAGES_DIR/$(ls -t $IMAGES_DIR 2>&-| head -1)/$FILENAME"
+  IMAGES_DIR="$($SCRIPT_ROOT/get_latest_image.sh --board=$BOARD)"
+  FLAGS_image="$IMAGES_DIR/$CHROMEOS_IMAGE_NAME"
 fi
 
 # Turn path into an absolute path.
 FLAGS_image=$(eval readlink -f "$FLAGS_image")
 
-
 IMAGE_DIR=$(dirname "$FLAGS_image")
 ROOT_FS_DIR="${IMAGE_DIR}/rootfs"
 STATEFUL_FS_DIR="${IMAGE_DIR}/stateful_partition"