diff --git a/roles/fvs-client/tasks/main.yml b/roles/fvs-client/tasks/main.yml
index 16ea639..9f90944 100644
--- a/roles/fvs-client/tasks/main.yml
+++ b/roles/fvs-client/tasks/main.yml
@@ -12,24 +12,25 @@
 
 
 ############## extra data partition ###############
-- name: mount data partition
-  mount:
-    src: "UUID={{ hostvars[inventory_hostname]['ansible_devices']['%s'|format(item)]['partitions']['%s1'|format(item)]['uuid'] }}"
-    path: /home/data
-    fstype: ext4
-    state: mounted
-  register: data_mounted
-  when: item + '1' in hostvars[inventory_hostname]['ansible_devices']['%s'|format(item)]['partitions']
-  loop:
-    - sdb
-    - sde
-
-- name: set sticky bit on data directory
-  file:
-    path: /home/data
-    state: directory
-    mode: '1777'
-  when: data_mounted.changed
+#- name: all devices
+#  set_fact:
+#    all_devices: "{{ ansible_devices.keys() | select('match', '^sd(.*)$|^nv(.*)$') | list | sort }}"
+#
+#- name: mount data partition
+#  mount:
+#    src: "UUID={{ hostvars[inventory_hostname]['ansible_devices'][all_devices[-1]]['partitions']['%s1'|format(item)]['uuid'] }}"
+#    path: /home/data
+#    fstype: ext4
+#    state: mounted
+#  register: data_mounted
+#  when: all_devices | length > 1 
+#
+#- name: set sticky bit on data directory
+#  file:
+#    path: /home/data
+#    state: directory
+#    mode: '1777'
+#  when: data_mounted.changed
 
 ################# from kiosk.yml ##################
 - name: grub timeout