diff --git a/installer/distro-setup.sh b/installer/distro-setup.sh
index e42882b2..0d723f95 100755
--- a/installer/distro-setup.sh
+++ b/installer/distro-setup.sh
@@ -1,5 +1,9 @@
 #!/bin/sh -x
 
+#  mount /data/home
+mkdir -p /data/home/
+mount  --bind  /data/home/    /home/
+
 # Create default user: user,admin,support
 echo "Setting user user password as user"
 useradd -G systemd-journal -s /bin/bash -m user
@@ -19,13 +23,18 @@ echo support | passwd support --stdin
 echo "%support    ALL=(ALL)       ALL" >> /etc/sudoers
 echo support | passwd --stdin
 
+# umount  /home/
+
+umount  /home/
+
 # prepare overlayfs
 mkdir -p /data/overlay/rootfs_etc/rw
 mkdir -p /data/overlay/rootfs_etc/work
-mkdir -p /data/overlay/rootfs_var/rw
-mkdir -p /data/overlay/rootfs_var/work
-mkdir -p /data/overlay/rootfs_home/rw
-mkdir -p /data/overlay/rootfs_home/work
+mkdir -p /data/var
+#mkdir -p /data/overlay/rootfs_var/rw
+#mkdir -p /data/overlay/rootfs_var/work
+#mkdir -p /data/overlay/rootfs_home/rw
+#mkdir -p /data/overlay/rootfs_home/work
 
 #provision path
 mkdir -p /data/tsg-os-provision
@@ -41,8 +50,19 @@ ln -sf /boot/grub /boot/grub2
 # treat grub2* as grub*
 ln -sf /usr/bin/grub2-editenv /usr/bin/grub-editenv
 
-rm -rf /data/overlay/rootfs_var/rw/lib/rpm
-rm -rf /data/overlay/rootfs_var/rw/lib/docker
+# look for empty dir    cp /var /data/var
+DIR="/data/var"
+if [ "$(ls -A $DIR)" ]; then
+    echo "$DIR is not Empty"
+else
+    echo "$DIR is Empty"
+    cp -a  /var/*   /data/var/
+fi
+#  copy rpm
+rm -rf /data/var/lib/rpm
+cp -a /var/lib/rpm    /data/var/lib/
+#
+rm -rf /data/var/lib/docker
 rm -rf /data/overlay/rootfs_etc/rw/ld.so.conf.d
 
 # Setup o/s mount points
@@ -52,8 +72,8 @@ ${1}               	    /                       ext4    defaults        1 1
 /dev/sda3               /update                 ext4    defaults        1 1
 /dev/sda5               /data                   ext4    defaults        1 1
 overlay                 /etc                    overlay x-systemd.requires=/,x-systemd.requires=/data,lowerdir=/etc,upperdir=/data/overlay/rootfs_etc/rw,workdir=/data/overlay/rootfs_etc/work 0 0
-overlay                 /var                    overlay x-systemd.requires=/,x-systemd.requires=/data,lowerdir=/var,upperdir=/data/overlay/rootfs_var/rw,workdir=/data/overlay/rootfs_var/work 0 0
-overlay                 /home                   overlay x-systemd.requires=/,x-systemd.requires=/data,lowerdir=/home,upperdir=/data/overlay/rootfs_home/rw,workdir=/data/overlay/rootfs_home/work 0 0
+/data/var               /var/              none     bind,x-systemd.requires=/,x-systemd.requires=/data           0 0
+/data/home              /home/             none     bind,x-systemd.requires=/,x-systemd.requires=/data           0 0
 EOF2
 ) > /etc/fstab