diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index 7ecfa3bb12..0bd83b6b78 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -304,9 +304,8 @@ finish_image() {
   local install_grub=0
   local disk_img="${BUILD_DIR}/${image_name}"
 
-  local disable_read_write="${FLAGS_FALSE}"
-  if [[ "${IMAGE_BUILD_TYPE}" == "prod" ]]; then
-    disable_read_write="${FLAGS_enable_rootfs_verification}"
+  if [[ "${IMAGE_BUILD_TYPE}" != "prod" ]]; then
+    FLAGS_enable_rootfs_verification=${FLAGS_FALSE}
   fi
 
   # Copy kernel to support dm-verity boots
@@ -355,7 +354,7 @@ finish_image() {
   fi
 
   # Make the filesystem un-mountable as read-write and setup verity.
-  if [[ ${disable_read_write} -eq ${FLAGS_TRUE} ]]; then
+  if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} ]]; then
     # Unmount /usr partition
     sudo umount --recursive "${root_fs_dir}/usr" || exit 1
 
@@ -405,7 +404,7 @@ finish_image() {
       target_list="arm64-efi"
     fi
     for target in ${target_list}; do
-      if [[ ${disable_read_write} -eq ${FLAGS_TRUE} && ${FLAGS_enable_verity} -eq ${FLAGS_TRUE} ]]; then
+      if [[ ${FLAGS_enable_rootfs_verification} -eq ${FLAGS_TRUE} && ${FLAGS_enable_verity} -eq ${FLAGS_TRUE} ]]; then
         ${BUILD_LIBRARY_DIR}/grub_install.sh \
             --board="${BOARD}" \
             --target="${target}" \