diff --git a/meta-xt-control-domain-virtio/recipes-guest/doma/doma.bbappend b/meta-xt-control-domain-virtio/recipes-guest/doma/doma.bbappend
index da3fc830..fe32471f 100644
--- a/meta-xt-control-domain-virtio/recipes-guest/doma/doma.bbappend
+++ b/meta-xt-control-domain-virtio/recipes-guest/doma/doma.bbappend
@@ -1,7 +1,13 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
+# virtio-env-weston.conf whould be used if we have the weston compositor in domd
+# the product should redefine variable.
+
+XT_DOMD_DISPLAY_SYSTEM ??= "weston"
+
 SRC_URI += "\
     file://virtio-env.conf \
+    file://virtio-env-weston.conf \
 "
 
 RDEPENDS:${PN} += " \
@@ -10,9 +16,16 @@ RDEPENDS:${PN} += " \
 
 FILES:${PN} += " \
     ${sysconfdir}/systemd/system/doma.service.d/virtio-env.conf \
+    ${@bb.utils.contains('XT_DOMD_DISPLAY_SYSTEM', 'weston', \
+        '${sysconfdir}/systemd/system/doma.service.d/virtio-env-weston.conf', \
+        '', d)} \
 "
 
 do_install:append() {
     install -d ${D}${sysconfdir}/systemd/system/doma.service.d
     install -m 0644 ${WORKDIR}/virtio-env.conf ${D}${sysconfdir}/systemd/system/doma.service.d
+
+    if ${@bb.utils.contains('XT_DOMD_DISPLAY_SYSTEM', 'weston', 'true', 'false', d)}; then
+        install -m 0644 ${WORKDIR}/virtio-env-weston.conf ${D}${sysconfdir}/systemd/system/doma.service.d
+    fi
 }
diff --git a/meta-xt-control-domain-virtio/recipes-guest/doma/files/virtio-env-weston.conf b/meta-xt-control-domain-virtio/recipes-guest/doma/files/virtio-env-weston.conf
new file mode 100644
index 00000000..5d0b08fe
--- /dev/null
+++ b/meta-xt-control-domain-virtio/recipes-guest/doma/files/virtio-env-weston.conf
@@ -0,0 +1,3 @@
+[Unit]
+Requires=backend-ready@weston-up.service
+After=backend-ready@weston-up.service
diff --git a/meta-xt-control-domain-virtio/recipes-guest/doma/files/virtio-env.conf b/meta-xt-control-domain-virtio/recipes-guest/doma/files/virtio-env.conf
index 3fd2939d..98ddeb7e 100644
--- a/meta-xt-control-domain-virtio/recipes-guest/doma/files/virtio-env.conf
+++ b/meta-xt-control-domain-virtio/recipes-guest/doma/files/virtio-env.conf
@@ -1,7 +1,3 @@
-[Unit]
-Requires=backend-ready@weston-up.service
-After=backend-ready@weston-up.service
-
 [Service]
 Type=simple
 ExecStart=
diff --git a/meta-xt-control-domain-virtio/recipes-guest/domu/domu.bbappend b/meta-xt-control-domain-virtio/recipes-guest/domu/domu.bbappend
index bb6d6d27..c22baca0 100644
--- a/meta-xt-control-domain-virtio/recipes-guest/domu/domu.bbappend
+++ b/meta-xt-control-domain-virtio/recipes-guest/domu/domu.bbappend
@@ -1,5 +1,10 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
+# virtio-env-weston.conf whould be used if we have the weston compositor in domd
+# the product should redefine variable.
+
+XT_DOMD_DISPLAY_SYSTEM ??= "weston"
+
 SRC_URI += "\
     file://virtio-env.conf \
     file://virtio-env-weston.conf \
@@ -12,7 +17,7 @@ RDEPENDS:${PN} += " \
 
 FILES:${PN} += " \
     ${sysconfdir}/systemd/system/domu.service.d/virtio-env.conf \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'gsx', \
+    ${@bb.utils.contains('XT_DOMD_DISPLAY_SYSTEM', 'weston', \
         '${sysconfdir}/systemd/system/domu.service.d/virtio-env-weston.conf', \
         '${sysconfdir}/systemd/system/domu.service.d/virtio-env-no-weston.conf', d)} \
 "
@@ -21,10 +26,7 @@ do_install:append() {
     install -d ${D}${sysconfdir}/systemd/system/domu.service.d
     install -m 0644 ${WORKDIR}/virtio-env.conf ${D}${sysconfdir}/systemd/system/domu.service.d
 
-    # this virtio-env-weston.conf whould be used if we have the 'wayland'
-    # distro feature inside DomU. But to avoid introducing new variable
-    # we can look on presence of GSX on the board.
-    if ${@bb.utils.contains('MACHINE_FEATURES', 'gsx', 'true', 'false', d)}; then
+    if ${@bb.utils.contains('XT_DOMD_DISPLAY_SYSTEM', 'weston', 'true', 'false', d)}; then
         install -m 0644 ${WORKDIR}/virtio-env-weston.conf ${D}${sysconfdir}/systemd/system/domu.service.d
     else
         install -m 0644 ${WORKDIR}/virtio-env-no-weston.conf ${D}${sysconfdir}/systemd/system/domu.service.d
diff --git a/meta-xt-control-domain/recipes-core/meta/meta-extsdk-toolchain.bbappend b/meta-xt-control-domain/recipes-core/meta/meta-extsdk-toolchain.bbappend
new file mode 100644
index 00000000..7645cbc2
--- /dev/null
+++ b/meta-xt-control-domain/recipes-core/meta/meta-extsdk-toolchain.bbappend
@@ -0,0 +1,3 @@
+
+DEPENDS:remove = " qemu-native qemu-helper-native"
+
diff --git a/meta-xt-control-domain/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-xt-control-domain/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
new file mode 100644
index 00000000..65d8c511
--- /dev/null
+++ b/meta-xt-control-domain/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
@@ -0,0 +1,3 @@
+
+RDEPENDS:${PN}:remove = " nativesdk-qemu nativesdk-qemu-helper"
+
diff --git a/meta-xt-driver-domain/recipes-core/systemd/files/sdl-env-kmsdrm.conf b/meta-xt-driver-domain/recipes-core/systemd/files/sdl-env-kmsdrm.conf
new file mode 100644
index 00000000..890522f1
--- /dev/null
+++ b/meta-xt-driver-domain/recipes-core/systemd/files/sdl-env-kmsdrm.conf
@@ -0,0 +1,2 @@
+[Manager]
+DefaultEnvironment="SDL_VIDEODRIVER=kmsdrm"
diff --git a/meta-xt-driver-domain/recipes-core/systemd/files/sdl-env.conf b/meta-xt-driver-domain/recipes-core/systemd/files/sdl-env-wayland.conf
similarity index 100%
rename from meta-xt-driver-domain/recipes-core/systemd/files/sdl-env.conf
rename to meta-xt-driver-domain/recipes-core/systemd/files/sdl-env-wayland.conf
diff --git a/meta-xt-driver-domain/recipes-core/systemd/systemd_%.bbappend b/meta-xt-driver-domain/recipes-core/systemd/systemd_%.bbappend
index 7049c7c6..6cceb6f1 100644
--- a/meta-xt-driver-domain/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-xt-driver-domain/recipes-core/systemd/systemd_%.bbappend
@@ -2,7 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI:append = " \
     file://ip_forward.conf \
-    file://sdl-env.conf \
+    file://sdl-env-wayland.conf \
+    file://sdl-env-kmsdrm.conf \
 "
 
 PACKAGECONFIG:append = " networkd"
@@ -14,5 +15,10 @@ USERADD_ERROR_DYNAMIC = "warn"
 do_install:append() {
     install -m 0644 ${WORKDIR}/ip_forward.conf ${D}${sysconfdir}/tmpfiles.d/
     install -d ${D}${sysconfdir}/systemd/system.conf.d/
-    install -m 0644 ${WORKDIR}/sdl-env.conf ${D}${sysconfdir}/systemd/system.conf.d/
+    # Check if 'weston' is included in the DISTRO_FEATURES or PACKAGECONFIG
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'true', 'false', d)}; then
+        install -m 0644 ${WORKDIR}/sdl-env-wayland.conf ${D}${sysconfdir}/systemd/system.conf.d/sdl-env.conf
+    else
+        install -m 0644 ${WORKDIR}/sdl-env-kmsdrm.conf ${D}${sysconfdir}/systemd/system.conf.d/sdl-env.conf
+    fi
 }
diff --git a/meta-xt-driver-domain/recipes-graphics/libsdl2/libsdl2_2.0.20.bbappend b/meta-xt-driver-domain/recipes-graphics/libsdl2/libsdl2_2.0.20.bbappend
new file mode 100644
index 00000000..6058904f
--- /dev/null
+++ b/meta-xt-driver-domain/recipes-graphics/libsdl2/libsdl2_2.0.20.bbappend
@@ -0,0 +1,2 @@
+
+PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', ' kmsdrm gles2 ', d)}"