diff --git a/image-yaml/overcloud-images-centos7.yaml b/image-yaml/overcloud-images-centos7.yaml
index 948cc143c..64b31d418 100644
--- a/image-yaml/overcloud-images-centos7.yaml
+++ b/image-yaml/overcloud-images-centos7.yaml
@@ -9,6 +9,8 @@ disk_images:
       FS_TYPE: xfs
     packages:
       - yum-plugin-priorities
+    options:
+      - "--mkfs-options '-s size=4096'"
   -
     imagename: ironic-python-agent
     type: qcow2
diff --git a/image-yaml/overcloud-images-rhel7.yaml b/image-yaml/overcloud-images-rhel7.yaml
index 8bc6b8e0c..59e5ad6b1 100644
--- a/image-yaml/overcloud-images-rhel7.yaml
+++ b/image-yaml/overcloud-images-rhel7.yaml
@@ -5,6 +5,8 @@ disk_images:
     distro: rhel7
     environment:
       FS_TYPE: xfs
+    options:
+      - "--mkfs-options '-s size=4096'"
   -
     imagename: ironic-python-agent
     type: qcow2
diff --git a/tripleo_common/image/image_builder.py b/tripleo_common/image/image_builder.py
index 010561993..06d7b76ea 100644
--- a/tripleo_common/image/image_builder.py
+++ b/tripleo_common/image/image_builder.py
@@ -17,6 +17,7 @@
 import abc
 import logging
 import os
+import shlex
 import six
 import subprocess
 import sys
@@ -94,7 +95,7 @@ class DibImageBuilder(ImageBuilder):
 
         if options:
             for option in options:
-                cmd.extend(option.split(' '))
+                cmd.extend(shlex.split(option))
 
         skip_base = extra_options.get('skip_base', False)
         if skip_base: