diff --git a/build_image b/build_image
index 62768a5960..90e2b1e695 100755
--- a/build_image
+++ b/build_image
@@ -655,13 +655,20 @@ if [[ $FLAGS_preserve -eq ${FLAGS_TRUE} ]] ; then
   fi
 fi
 
-# Minimize rootfs size for dev install shim and factory installer
-if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} -o \
-     ${FLAGS_dev_install} -eq ${FLAGS_TRUE} ] ; then
+# Minimize rootfs size for factory installer
+if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ]; then
   info "Fixing the rootfs size at 300 MiB for the factory installer"
   FLAGS_rootfs_size=300
 fi
 
+# Minimize rootfs size and statefulfs size for dev install shim
+if [ ${FLAGS_dev_install} -eq ${FLAGS_TRUE} ] ; then
+  info "Fixing the rootfs size at 300 MiB for dev install shim"
+  FLAGS_rootfs_size=300
+  info "Fixing the statefulfs size at 140 MiB for dev install shim"
+  FLAGS_statefulfs_size=140
+fi
+
 # Create the boot.desc file which stores the build-time configuration
 # information needed for making the image bootable after creation with
 # cros_make_image_bootable.