diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
index 5efe5c43ea..7e8db45097 100644
--- a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
@@ -164,8 +164,11 @@
               {{tr "Image mapping driver"}}
             </label>
             <select name="img_driver" id="img_driver">
-              <option value="raw" selected="selected">raw</option>
+              <option value=""></option>
+              <option value="raw">raw</option>
+              <option value="bochs">bochs</option>
               <option value="qcow2">qcow2</option>
+              <option value="qed">qed</option>
               <option value="custom">custom</option>
             </select>
             <div>
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs
index f4ea7f4fc0..0ba1ff6ad9 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs
@@ -16,6 +16,7 @@
       <option value="bochs">bochs</option>
       <option value="qcow2">qcow2</option>
       <option value="qed">qed</option>
+      <option value="custom">custom</option>
     </select>
   </div>
 </div>