diff --git a/recipes-support/nmhw-auto-part/nmhw-auto-part/nmhw-auto-part b/recipes-support/nmhw-auto-part/nmhw-auto-part/nmhw-auto-part
index 6c92146..e51fd82 100644
--- a/recipes-support/nmhw-auto-part/nmhw-auto-part/nmhw-auto-part
+++ b/recipes-support/nmhw-auto-part/nmhw-auto-part/nmhw-auto-part
@@ -104,9 +104,9 @@ expand_partition(){
   local newend
   newend=$(($start + $newsize * 1024 * 1024 / $(cat /sys/block/$devicename/queue/hw_sector_size)))
 
-  echo -e "d\n$partn\nn\np\n$partn\n$start\n$newend\nw\n" | fdisk $device > /dev/null 2>&1
-  partprobe $device >> /var/log/nmhw-auto-part.log 2>&1 || true
-  resize2fs $partdevice >> /var/log/nmhw-auto-part.log 2>&1
+  parted $device resizepart 1 yes ${newend}s >> /tmp/log/nmhw-auto-part.log 2>&1 || true
+  partprobe $device >> /tmp/log/nmhw-auto-part.log 2>&1 || true
+  resize2fs $partdevice >> /tmp/log/nmhw-auto-part.log 2>&1
 }
 
 
@@ -163,13 +163,13 @@ append_partition(){
     fi
   fi
 
-  echo -e "n\np\n$partn\n$start\n$end\nw\n" | fdisk $device > /dev/null 2>&1
-  partprobe $device >> /var/log/nmhw-auto-part.log 2>&1 || true
+  parted -s $device mkpart primary ext4 ${start}s ${end}s >> /tmp/log/nmhw-auto-part.log 2>&1 || true
+  partprobe $device >> /tmp/log/nmhw-auto-part.log 2>&1 || true
 
   # Get the partiton device e.g. /dev/mmcblk1p2
   local partdevice
   partdevice=$(ls $device*[$partn] | tail -n 1)
-  mkfs.ext4 $partdevice >> /var/log/nmhw-auto-part.log 2>&1
+  mkfs.ext4 $partdevice >> /tmp/log/nmhw-auto-part.log 2>&1
 
   createdPartition=$partdevice
 }
@@ -280,12 +280,12 @@ execute(){
 
   case "$ptype" in
   "data")
-      mkdir -p /mnt/data
+      mkdir -p /mnt/data || true
       ;;
   "overlay")
       mkdir -p /mnt/.work
       mkdir -p /mnt/overlay
-      systemctl enable mount-overlay.service >> /var/log/nmhw-auto-part.log 2>&1
+      systemctl enable mount-overlay.service >> /tmp/log/nmhw-auto-part.log 2>&1
       systemctl start mount-overlay.service
       ;;
   *)
@@ -294,7 +294,7 @@ execute(){
   esac
 
   echo "Partitioning successful."
-  echo "Partitioning successful." >> /var/log/nmhw-auto-part.log
+  echo "Partitioning successful." >> /tmp/log/nmhw-auto-part.log
 }
 
 usage(){
@@ -318,10 +318,11 @@ description(){
 # exit when any commands fails
 set -e
 
-echo "Script started $(date)." >> /var/log/nmhw-auto-part.log
-echo "Script run with parameters 1: $1 2: $2 3: $3 4: $4 5: $5" >> /var/log/nmhw-auto-part.log
-echo "" >> /var/log/nmhw-auto-part.log
-echo "" >> /var/log/nmhw-auto-part.log
+mkdir -p /tmp/log
+echo "Script started $(date)." >> /tmp/log/nmhw-auto-part.log
+echo "Script run with parameters 1: $1 2: $2 3: $3 4: $4 5: $5" >> /tmp/log/nmhw-auto-part.log
+echo "" >> /tmp/log/nmhw-auto-part.log
+echo "" >> /tmp/log/nmhw-auto-part.log
 
 if (( $# == 1 )) ; then
   case $1 in