diff --git a/conf/layer.conf b/conf/layer.conf
index 754ac49..2fb6dc4 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -20,11 +20,14 @@ INITRAMFS_MAXSIZE="200000"
 INHERIT += "rm_work"
 
 EXTRA_IMAGE_FEATURES ?= " ssh-server-dropbear read-only-rootfs "
-# ssh-server-dropbear
 DISTRO_FEATURES:append := " opengl "
-DISTRO_FEATURES:remove = " x11 vulkan ptest"
+DISTRO_FEATURES:remove = " x11 vulkan ptest "
 TOOLCHAIN_TARGET_TASK:append = " libgles3-mesa-dev "
 # DISTRO_FEATURES:append := " vc4-gfx opengl directfb "
 
 WKS_FILE="image.wks.in"
-ROOT_HOME = "/root"
+ROOT_HOME = "/run/root"
+
+PREFERRED_PROVIDER_virtual/kernel:qemux86-64 = "linux-yocto"
+EXTRA_IMAGE_FEATURES:qemux86-64 = " ssh-server-dropbear "
+# DISTRO_FEATURES:append:qemux86-64 = " vulkan "
\ No newline at end of file
diff --git a/recipes-core/base-files/base-files_%.bbappend b/recipes-core/base-files/base-files_%.bbappend
index 1d9980f..3884519 100644
--- a/recipes-core/base-files/base-files_%.bbappend
+++ b/recipes-core/base-files/base-files_%.bbappend
@@ -7,13 +7,14 @@ export XDG_RUNTIME_DIR=/home/$USER/.xdg
 export XDG_CONFIG_HOME=/home/$USER/.config
 export PATH=$PATH:/home/$USER/bin:/home/$USER/.local/bin
 export LD_LIBRARY_PATH=/home/$USER/lib:/home/$USER/.local/lib
+export DBUS_SYSTEM_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket
 if [ ! -e "$XDG_RUNTIME_DIR" ]; then
     mkdir -p "$XDG_RUNTIME_DIR"
 fi
 export TERM=xterm-256color
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-    eval $(dbus-launch --auto-syntax)
-fi
+#if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+#    eval $(dbus-launch --auto-syntax)
+#fi
 EOF
 
 cat << EOF >> "${D}${sysconfdir}/profile"
diff --git a/recipes-core/images/base-image.inc b/recipes-core/images/base-image.inc
index 06d97c8..c98f908 100644
--- a/recipes-core/images/base-image.inc
+++ b/recipes-core/images/base-image.inc
@@ -1,6 +1,8 @@
 inherit extrausers
 
-EXTRA_USERS_PARAMS = "usermod -p 2Pe/4xyFxsokE diya; \
+EXTRA_USERS_PARAMS =    "groupadd xdg; \
+                        usermod -d /home/diya -p 2Pe/4xyFxsokE diya; \
+                        usermod -a -G xdg diya; \
                         usermod -a -G video diya; \
                         usermod -a -G tty diya; \
                         usermod -a -G input diya; \
@@ -8,7 +10,7 @@ EXTRA_USERS_PARAMS = "usermod -p 2Pe/4xyFxsokE diya; \
                         usermod -a -G audio diya; \
                         usermod -a -G sudo diya; \
                         "
-IMAGE_BOOT_FILES:append = "fs_resize config.txt recovery-${MACHINE}.cpio.gz Image "
+IMAGE_BOOT_FILES:append = " fs_resize config.txt recovery-${MACHINE}.cpio.gz Image "
 
 IMAGE_INSTALL:append = "kernel-modules \
                         e2fsprogs \
diff --git a/recipes-diya/diya-overlay/diya-overlay.bb b/recipes-diya/diya-overlay/diya-overlay.bb
index 5ec8448..eeba401 100644
--- a/recipes-diya/diya-overlay/diya-overlay.bb
+++ b/recipes-diya/diya-overlay/diya-overlay.bb
@@ -26,7 +26,7 @@ do_install() {
     install -m 0755 ${WORKDIR}/confd ${D}/${sysconfdir}/init.d/confd
     install -d ${D}/sbin/
     install -d ${D}/etc/default/volatiles
-	# install -m 0644 ${WORKDIR}/80_diya ${D}${sysconfdir}/default/volatiles
+	install -m 0644 ${WORKDIR}/80_diya ${D}${sysconfdir}/default/volatiles
     install -m 0755 ${WORKDIR}/expandfs.sh ${D}/sbin/expandfs.sh
     install -m 0755 ${WORKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
     install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
diff --git a/recipes-diya/diya-overlay/files/80_diya b/recipes-diya/diya-overlay/files/80_diya
index 19504cd..7afebec 100644
--- a/recipes-diya/diya-overlay/files/80_diya
+++ b/recipes-diya/diya-overlay/files/80_diya
@@ -1,3 +1 @@
-# d root root 0755 /var/etc/upper none
-# d root root 0755 /var/etc/work none
-# l root root 0644 /etc/dropbear /var/etc/dropbear
+d root root 0755 /run/root none
diff --git a/recipes-diya/diya-overlay/files/confd b/recipes-diya/diya-overlay/files/confd
index 08d72f8..548df03 100644
--- a/recipes-diya/diya-overlay/files/confd
+++ b/recipes-diya/diya-overlay/files/confd
@@ -26,9 +26,11 @@ case "$1" in
             umount /dev/${DISK}p4
             yes | mkfs.ext4 /dev/${DISK}p4
             mount /dev/${DISK}p4 /home
+            rm /boot/home_partition_should_be_formated
+        fi
+        if [ ! -d "/home/diya" ]; then
             mkdir -p /home/diya
             chown -R diya:diya /home/diya
-            rm /boot/home_partition_should_be_formated
         fi
         if [ -e "/boot/wpa_supplicant.conf" ];then
             mv /boot/wpa_supplicant.conf /etc/network/
diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl_%.bbappend
new file mode 100644
index 0000000..6b84baf
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-gl_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:class-target = "opengl gallium"
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
new file mode 100644
index 0000000..3901439
--- /dev/null
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -0,0 +1,4 @@
+# Enable KMS renderonly Mesa support
+# See https://cgit.freedesktop.org/mesa/mesa/commit/?id=2b780fe89300199f2334539aa1678e9b68f0434f
+GALLIUMDRIVERS:append = ",kmsro"
+GALLIUMDRIVERS:append:qemux86-64 = ",virgl"