diff --git a/build_image b/build_image
index c1d4bdf752..1361315b48 100755
--- a/build_image
+++ b/build_image
@@ -151,17 +151,14 @@ fi
 
 if [[ "${DEV_IMAGE}" -eq 1 ]]; then
   create_dev_image ${COREOS_DEVELOPER_IMAGE_NAME} ${DISK_LAYOUT} ${FLAGS_group}
-  upload_image "${BUILD_DIR}/${COREOS_DEVELOPER_IMAGE_NAME}"
 fi
 
 if [[ "${CONTAINER}" -eq 1 ]]; then
   create_dev_image "${COREOS_DEVELOPER_CONTAINER_NAME}" "${CONTAINER_LAYOUT}" "${FLAGS_group}"
-  upload_image "${BUILD_DIR}/${OREOS_DEVELOPER_CONTAINER_NAME}"
 fi
 
 if [[ "${PROD_IMAGE}" -eq 1 ]]; then
   create_prod_image ${COREOS_PRODUCTION_IMAGE_NAME} ${DISK_LAYOUT} ${FLAGS_group}
-  upload_image "${BUILD_DIR}/${COREOS_PRODUCTION_IMAGE_NAME}"
   if [[ ${FLAGS_generate_update} -eq ${FLAGS_TRUE} ]]; then
     generate_update "${COREOS_PRODUCTION_IMAGE_NAME}" ${DISK_LAYOUT}
   fi
diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh
index 4b036979cb..259f5c3dc8 100755
--- a/build_library/dev_image_util.sh
+++ b/build_library/dev_image_util.sh
@@ -93,4 +93,6 @@ EOF
   systemd_enable "${root_fs_dir}" "local-fs.target" "remount-usr.service"
 
   finish_image "${disk_layout}" "${root_fs_dir}"
+  upload_image -d "${BUILD_DIR}/${image_name}.bz2.DIGESTS" \
+      "${BUILD_DIR}/${image_name}"
 }
diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh
index 4fd934bb4a..26a6dbe350 100755
--- a/build_library/prod_image_util.sh
+++ b/build_library/prod_image_util.sh
@@ -76,4 +76,7 @@ EOF
     "${BUILD_LIBRARY_DIR}/disk_util" --disk_layout="${disk_layout}" \
       tune --disable2fs_rw "${BUILD_DIR}/${image_name}" "USR-A"
   fi
+
+  upload_image -d "${BUILD_DIR}/${image_name}.bz2.DIGESTS" \
+      "${BUILD_DIR}/${image_name}"
 }