diff --git a/recipes-diya/diya-overlay/files/confd b/recipes-diya/diya-overlay/files/confd
index 7808bff..490c44b 100644
--- a/recipes-diya/diya-overlay/files/confd
+++ b/recipes-diya/diya-overlay/files/confd
@@ -19,8 +19,10 @@ case "$1" in
             echo "Trying to format the home partition"
             umount /dev/mmcblk0p3
             yes | mkfs.ext4 /dev/mmcblk0p3
+            mount /dev/mmcblk0p3 /home
+            mkdir -p /home/diya
+            chown -R diya:diya /home/diya
             rm /boot/home_partition_should_be_formated
-            reboot
         fi
         if [ -e "/boot/wpa_supplicant.conf" ];then
             install -m 0644 /boot/wpa_supplicant.conf /var/etc/network
diff --git a/wic/rpi.wks.in b/wic/rpi.wks.in
index bc78eed..2c15303 100644
--- a/wic/rpi.wks.in
+++ b/wic/rpi.wks.in
@@ -4,7 +4,7 @@
 
 part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 32
 # read only roofs
-part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 --size 150
+part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 --size 150 --exclude-path=home/ --exclude-path=var/etc/
 # modifiable configurations stored in /var/etc
 part /var/etc --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var/etc --ondisk mmcblk0 --fstype=ext4 --label diya --align 1024 --size 32
 # home partition