diff --git a/imagefactory/dib_deploy_ramdisk_ironic.tdl b/imagefactory/dib_deploy_ramdisk_ironic.tdl
index a7cd2f453..35588cebf 100644
--- a/imagefactory/dib_deploy_ramdisk_ironic.tdl
+++ b/imagefactory/dib_deploy_ramdisk_ironic.tdl
@@ -3,7 +3,7 @@
mount /dev/vdb1 /mnt
cp /etc/sudoers /etc/sudoers_backup
sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers
- qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
+ qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
instack-build-images deploy-ramdisk
diff --git a/imagefactory/dib_discovery_ramdisk.tdl b/imagefactory/dib_discovery_ramdisk.tdl
index d16d81188..76fc45383 100644
--- a/imagefactory/dib_discovery_ramdisk.tdl
+++ b/imagefactory/dib_discovery_ramdisk.tdl
@@ -3,7 +3,7 @@
mount /dev/vdb1 /mnt
cp /etc/sudoers /etc/sudoers_backup
sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers
- qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
+ qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
instack-build-images discovery-ramdisk
diff --git a/imagefactory/dib_overcloud_cinder_volume.tdl b/imagefactory/dib_overcloud_cinder_volume.tdl
index 619500292..5bd62f6bc 100644
--- a/imagefactory/dib_overcloud_cinder_volume.tdl
+++ b/imagefactory/dib_overcloud_cinder_volume.tdl
@@ -3,7 +3,7 @@
mount /dev/vdb1 /mnt
cp /etc/sudoers /etc/sudoers_backup
sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers
- qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
+ qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
instack-build-images overcloud-cinder-volume
diff --git a/imagefactory/dib_overcloud_compute.tdl b/imagefactory/dib_overcloud_compute.tdl
index 2370b2ad4..7d6698657 100644
--- a/imagefactory/dib_overcloud_compute.tdl
+++ b/imagefactory/dib_overcloud_compute.tdl
@@ -3,7 +3,7 @@
mount /dev/vdb1 /mnt
cp /etc/sudoers /etc/sudoers_backup
sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers
- qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
+ qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
instack-build-images overcloud-compute
diff --git a/imagefactory/dib_overcloud_control.tdl b/imagefactory/dib_overcloud_control.tdl
index 24e848f5b..03126a738 100644
--- a/imagefactory/dib_overcloud_control.tdl
+++ b/imagefactory/dib_overcloud_control.tdl
@@ -3,7 +3,7 @@
mount /dev/vdb1 /mnt
cp /etc/sudoers /etc/sudoers_backup
sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers
- qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
+ qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
instack-build-images overcloud-control
diff --git a/imagefactory/dib_overcloud_swift_storage.tdl b/imagefactory/dib_overcloud_swift_storage.tdl
index 29375d99d..2596bb2e6 100644
--- a/imagefactory/dib_overcloud_swift_storage.tdl
+++ b/imagefactory/dib_overcloud_swift_storage.tdl
@@ -3,7 +3,7 @@
mount /dev/vdb1 /mnt
cp /etc/sudoers /etc/sudoers_backup
sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers
- qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
+ qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2
export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
instack-build-images overcloud-swift-storage