diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index f1d3a50dd2..9bef8ed77e 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -229,11 +229,13 @@ IMG_brightbox_OEM_USE=brightbox
 IMG_pxe_DISK_FORMAT=cpio
 IMG_pxe_PARTITIONED_IMG=0
 IMG_pxe_CONF_FORMAT=pxe
+IMG_pxe_MEM=2048
 
 ## iso, which is an cpio image
 IMG_iso_DISK_FORMAT=iso
 IMG_iso_PARTITIONED_IMG=0
 IMG_iso_CONF_FORMAT=iso
+IMG_iso_MEM=2048
 
 ## gce, image tarball
 IMG_gce_DISK_LAYOUT=vm
diff --git a/build_torcx_store b/build_torcx_store
index 2f8db48071..d489cb7cb3 100755
--- a/build_torcx_store
+++ b/build_torcx_store
@@ -218,14 +218,13 @@ function torcx_package() {
 # for each package will point at the last version specified.  This can handle
 # swapping default package versions for different OS releases by reordering.
 DEFAULT_IMAGES=(
+        =app-torcx/docker-17.06
         =app-torcx/docker-1.12
 )
 
 # This list contains extra images which will be uploaded and included in the
 # generated manifest, but won't be included in the vendor store.
-EXTRA_IMAGES=(
-        =app-torcx/docker-17.06
-)
+EXTRA_IMAGES=()
 
 mkdir -p "${BUILD_DIR}"
 manifest_path="${BUILD_DIR}/torcx_manifest.json"