diff --git a/files/diskspreparation.sh b/files/diskspreparation.sh
index aecf91630fb7470c452b0f12bd402fc8873be15e..7fa01ec53ffa5cf0c216389b9a086a49f4d2da65 100755
--- a/files/diskspreparation.sh
+++ b/files/diskspreparation.sh
@@ -292,9 +292,8 @@ generateFSTab() {
     idx=1
     for part in $(eval "for p in \${DISK_$(echo ${disk} | tr [a-z] [A-Z])_PARTITIONS[@]}; do echo \$p; done ")
     do
-      blkidout=$(blkid /dev/${disk}${idx})
-      uuid=$(echo ${blkidout} | sed "s/^.*UUID=\([^\ ]*\).*$/\1/g;s/\"//g")
-      fs=$(echo ${blkidout} | sed "s/^.*TYPE=\([^\ ]*\).*$/\1/g;s/\"//g")
+      uuid=$(blkid -s UUID -o value /dev/${disk}${idx})
+      fs=$(blkid -s TYPE -o value /dev/${disk}${idx})
       mntpnt=$(echo ${part} | cut -f 3 -d ":") 
       opts=$(echo ${part} | cut -f 4 -d ":") 
       dmp=$(echo ${part} | cut -f 5 -d ":")