diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
index a8c28d5d4e5..ff04fd79bd8 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
@@ -68,7 +68,7 @@ define(function(require) {
     var rtn = "";
     if(config && config.system_config && config.system_config.support_fs && Array.isArray(config.system_config.support_fs)){
       config.system_config.support_fs.forEach(element => {
-        rtn += "<option>"+element+"</option>";
+        rtn += "<option value='"+element+"'>"+element+"</option>";
       });
     }
     return rtn;
@@ -78,7 +78,7 @@ define(function(require) {
     return TemplateHTML({
       "diskTabId": this.diskTabId,
       "imageTableSelectHTML": this.imageTable.dataTableHTML,
-      "pepe": optionsFilesystem()
+      "optionsFilesystem": optionsFilesystem()
     });
   }
 
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs
index 3e20b5c8507..7f27311531c 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs
@@ -100,7 +100,7 @@
         {{tr "Filesystem"}}
       </label>
       <select class="hypervisor only_kvm" wizard_field="FS" id="TYPE_KVM" name="type">
-        {{{pepe}}}
+        {{{optionsFilesystem}}}
       </select>
     </div>
     <div class="medium-6 columns">