diff --git a/build_library/legacy_disk_layout.json b/build_library/legacy_disk_layout.json
index 85c40f1d1c..098bf4b114 100644
--- a/build_library/legacy_disk_layout.json
+++ b/build_library/legacy_disk_layout.json
@@ -73,6 +73,14 @@
         "type":"data",
         "blocks":"6291456"
       }
+    ],
+    "vagrant": [
+      {
+        "num": 9,
+        "label":"STATE",
+        "type":"data",
+        "blocks":"33587200"
+      }
     ]
   }
 }
diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 2116e7a639..205cb50377 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -70,13 +70,13 @@ IMG_virtualbox_CONF_FORMAT=ovf
 
 ## vagrant
 IMG_vagrant_DISK_FORMAT=vmdk
-IMG_vagrant_DISK_LAYOUT=vm
+IMG_vagrant_DISK_LAYOUT=vagrant
 IMG_vagrant_CONF_FORMAT=vagrant
 IMG_vagrant_OEM_PACKAGE=oem-vagrant
 
 ## vagrant_vmware
 IMG_vagrant_vmware_fusion_DISK_FORMAT=vmdk
-IMG_vagrant_vmware_fusion_DISK_LAYOUT=vm
+IMG_vagrant_vmware_fusion_DISK_LAYOUT=vagrant
 IMG_vagrant_vmware_fusion_CONF_FORMAT=vagrant_vmware_fusion
 IMG_vagrant_vmware_fusion_OEM_PACKAGE=oem-vagrant