diff --git a/build_image b/build_image
index d2ce15e238..588da4512b 100755
--- a/build_image
+++ b/build_image
@@ -166,6 +166,7 @@ fi
 fix_mtab
 
 if [[ "${DEV_IMAGE}" -eq 1 ]]; then
+  IMAGE_BUILD_TYPE="dev"
   create_dev_image ${COREOS_DEVELOPER_IMAGE_NAME} ${DEV_DISK_LAYOUT} ${FLAGS_group} ${FLAGS_base_dev_pkg}
   if [[ ${FLAGS_extract_update} -eq ${FLAGS_TRUE} ]]; then
     extract_update "${COREOS_DEVELOPER_IMAGE_NAME}" "${DEV_DISK_LAYOUT}"
@@ -173,10 +174,12 @@ if [[ "${DEV_IMAGE}" -eq 1 ]]; then
 fi
 
 if [[ "${CONTAINER}" -eq 1 ]]; then
+  IMAGE_BUILD_TYPE="container"
   create_dev_image "${COREOS_DEVELOPER_CONTAINER_NAME}" "${CONTAINER_LAYOUT}" "${FLAGS_group}" ${FLAGS_base_dev_pkg}
 fi
 
 if [[ "${PROD_IMAGE}" -eq 1 ]]; then
+  IMAGE_BUILD_TYPE="prod"
   create_prod_image ${COREOS_PRODUCTION_IMAGE_NAME} ${DISK_LAYOUT} ${FLAGS_group} ${FLAGS_base_pkg}
   if [[ ${FLAGS_generate_update} -eq ${FLAGS_TRUE} ]]; then
     generate_update "${COREOS_PRODUCTION_IMAGE_NAME}" ${DISK_LAYOUT}
diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index be41387b28..242099dfa8 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -335,7 +335,7 @@ finish_image() {
   fi
 
   # We only need to disable rw and apply dm-verity in prod with a /usr partition
-  if [ "${PROD_IMAGE}" -eq 1 ] && mountpoint -q "${root_fs_dir}/usr"; then
+  if [ "${IMAGE_BUILD_TYPE}" = "prod" ] && mountpoint -q "${root_fs_dir}/usr"; then
     local disable_read_write=${FLAGS_enable_rootfs_verification}
 
     # Unmount /usr partition
@@ -377,7 +377,7 @@ finish_image() {
       target_list="arm64-efi"
     fi
     for target in ${target_list}; do
-      if [[ "${PROD_IMAGE}" -eq 1 && ${FLAGS_enable_verity} -eq ${FLAGS_TRUE} ]]; then
+      if [[ "${IMAGE_BUILD_TYPE}" = "prod" && ${FLAGS_enable_verity} -eq ${FLAGS_TRUE} ]]; then
         ${BUILD_LIBRARY_DIR}/grub_install.sh \
             --board="${BOARD}" \
             --target="${target}" \