diff --git a/tasks/main.yml b/tasks/main.yml
index 5cfb8ae..03297ec 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,7 +29,7 @@
     item.device is defined and (
     filesystems_state == "mounted" or
     filesystems_state == "formated" ) and
-    not item.fstype == "fat32"
+    not item.fstype == "vfat"
 
 - name: format fat32
   command: mkfs.fat -F32 {{ item.device }}
@@ -37,12 +37,12 @@
   when:
     item.device is defined and
     filesystems_state == "formated" and
-    item.fstype == "fat32"
+    item.fstype == "vfat"
 
 - name: mount filesystems
   mount:
     name: "{{ root_target_directory  | default('') }}{{ root_target_directory is defined | ternary('/','') }}{{ item.mount_point }}"
-    src: "UUID={{ item.uuid }}"
+    src: "{{ (item.uuid is defined | ternary('UUID=','')) + item.uuid | default(item.device) }}"
     fstype: "{{ item.fstype }}"
     opts: '{{ item.mount_options | default("defaults") }}'
     state: mounted