diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js b/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
index e0d19d89f9..bcdd521c31 100644
--- a/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
@@ -252,6 +252,11 @@ define(function(require) {
         img_json["FORMAT"] = driver;
     }
 
+    var filesystem = WizardFields.retrieveInput($("#img_fs", context));
+    if (filesystem != undefined && filesystem.length) {
+        img_json["FS"] = filesystem;
+    }
+
     var target = WizardFields.retrieveInput($("#img_target", context));
     if (target)
         img_json["TARGET"] = target;
diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard-tabs/image.js b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard-tabs/image.js
index 7b6a17a112..34f71d0247 100644
--- a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard-tabs/image.js
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard-tabs/image.js
@@ -73,6 +73,16 @@ define(function(require) {
 
   return WizardTab;
 
+  function optionsFilesystem(){
+    var rtn = "<option value=''>--</option>";
+    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 value='"+element+"'>"+element+"</option>";
+      });
+    }
+    return rtn;
+  };
+
   /*
     FUNCTION DEFINITIONS
    */
@@ -87,6 +97,7 @@ define(function(require) {
         "prepend": prepend,
         "formPanelId": this.formPanelId,
         "customTagsHTML": CustomTagsTable.html(),
+        "optionsFilesystem": optionsFilesystem(),
       }),
       "advanced": TemplateAdvancedHTML({
         "prepend": prepend,
@@ -382,4 +393,3 @@ define(function(require) {
   }
 
 });
-
diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard-tabs/image/html.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard-tabs/image/html.hbs
index 30ceebd586..5ec6152e5f 100644
--- a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard-tabs/image/html.hbs
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard-tabs/image/html.hbs
@@ -193,6 +193,16 @@
             <input type="text" name="{{prepend}}_target" id="{{prepend}}_target" />
           </div>
         </div>
+        <div class="row not_vcenter">
+          <div class="large-12 columns datablock-input">
+            <label for="{{prepend}}_fs">
+              {{tr "Filesystem"}}
+            </label>
+            <select name="{{prepend}}_fs" id="{{prepend}}_fs">
+              {{{optionsFilesystem}}}
+            </select>
+          </div>
+        </div>
       </div>
     </div>
     <br>
diff --git a/src/sunstone/public/app/tabs/images-tab/panels/info-common.js b/src/sunstone/public/app/tabs/images-tab/panels/info-common.js
index aa80143b3f..81d393aa3e 100644
--- a/src/sunstone/public/app/tabs/images-tab/panels/info-common.js
+++ b/src/sunstone/public/app/tabs/images-tab/panels/info-common.js
@@ -61,7 +61,7 @@ define(function(require) {
     var templateTableHTML = TemplateTable.html(this.element.TEMPLATE, this.resource, Locale.tr("Attributes"));
     var permissionsTableHTML = PermissionsTable.html(this.tabId, this.resource, this.element);
     var prettyRegTime = Humanize.prettyTime(this.element.REGTIME);
-    var fsTypeStr = this.element.FS_TYPE != undefined ? this.element.FS_TYPE : '-';
+    var fsTypeStr = this.element.FS != undefined ? this.element.FS : '-';
     var sizeStr = Humanize.sizeFromMB(this.element.SIZE);
     var persistentStr = parseInt(this.element.PERSISTENT) ? Locale.tr("yes") : Locale.tr("no");
 
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 527ab3ea37..47a4956747 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
@@ -65,7 +65,7 @@ define(function(require) {
    */
 
   function optionsFilesystem(){
-    var rtn = "";
+    var rtn = "<option value=''>-</option>";
     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 value='"+element+"'>"+element+"</option>";
@@ -134,10 +134,13 @@ define(function(require) {
           if($("select#FORMAT_KVM", volatileContext).val() === "qcow2"){
             $("select#DRIVER", volatileContext).val("qcow2");
           }
+          $("select#FS_KVM", volatileContext).parent().show();
           break;
         case "swap":
           $("select#FORMAT_KVM", volatileContext).parent().hide();
           $("select#DRIVER", volatileContext).val("");
+          $("select#FS_KVM", volatileContext).val("");
+          $("select#FS_KVM", volatileContext).parent().hide();
           break;
       }
     });
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 b8d6dee9a9..82b4a37953 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
@@ -99,7 +99,7 @@
       <label for="TYPE">
         {{tr "Filesystem"}}
       </label>
-      <select class="hypervisor only_kvm" wizard_field="FS" id="TYPE_KVM" name="type">
+      <select class="hypervisor only_kvm" wizard_field="FS" id="FS_KVM" name="type">
         {{{optionsFilesystem}}}
       </select>
     </div>