diff --git a/targets/x86-64 b/targets/x86-64
index 9d690285..1a739122 100644
--- a/targets/x86-64
+++ b/targets/x86-64
@@ -1,6 +1,6 @@
 . targets/x86.inc
 
-factory_image x86-64 combined-ext4 .img.gz
-factory_image x86-64 combined-ext4 .vdi
-factory_image x86-64 combined-ext4 .vmdk
-sysupgrade_image x86-64 combined-ext4 .img.gz
+factory_image x86-64 combined-squashfs .img.gz
+factory_image x86-64 combined-squashfs .vdi
+factory_image x86-64 combined-squashfs .vmdk
+sysupgrade_image x86-64 combined-squashfs .img.gz
diff --git a/targets/x86-generic b/targets/x86-generic
index 9158a8aa..2dfc852b 100644
--- a/targets/x86-generic
+++ b/targets/x86-generic
@@ -1,8 +1,8 @@
 . targets/x86.inc
 
-factory_image x86-generic combined-ext4 .img.gz
-factory_image x86-generic combined-ext4 .vdi
-factory_image x86-generic combined-ext4 .vmdk
-sysupgrade_image x86-generic combined-ext4 .img.gz
+factory_image x86-generic combined-squashfs .img.gz
+factory_image x86-generic combined-squashfs .vdi
+factory_image x86-generic combined-squashfs .vmdk
+sysupgrade_image x86-generic combined-squashfs .img.gz
 manifest_alias x86-kvm
 manifest_alias x86-xen_domu
diff --git a/targets/x86-geode b/targets/x86-geode
index faa771d2..58fb9aeb 100644
--- a/targets/x86-geode
+++ b/targets/x86-geode
@@ -1,5 +1,5 @@
 packages 'kmod-3c59x' 'kmod-8139cp' 'kmod-8139too' 'kmod-e100' 'kmod-e1000' 'kmod-forcedeth' 'kmod-igb' 'kmod-natsemi' 'kmod-ne2k-pci'
 packages 'kmod-pcnet32' 'kmod-r8169' 'kmod-sis900' 'kmod-sky2' 'kmod-tg3' 'kmod-tulip' 'kmod-via-rhine' 'kmod-via-velocity'
 
-factory_image x86-geode combined-ext4 .img.gz
-sysupgrade_image x86-geode combined-ext4 .img.gz
+factory_image x86-geode combined-squashfs .img.gz
+sysupgrade_image x86-geode combined-squashfs .img.gz