diff --git a/recipes-graphics/essosrmgr/essosrmgr.bb b/recipes-graphics/essosrmgr/essosrmgr.bb
new file mode 100644
index 00000000..fd0141f6
--- /dev/null
+++ b/recipes-graphics/essosrmgr/essosrmgr.bb
@@ -0,0 +1,48 @@
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1d13a8bfca16dbdad01fe5f270451aaa \
+                    file://LICENSE;md5=1d13a8bfca16dbdad01fe5f270451aaa"
+
+SRC_URI = "${CMF_GIT_ROOT}/rdk/components/generic/ermgr;protocol=${CMF_GIT_PROTOCOL};branch=rdk-next;nobranch=1;name=essosrmgr"
+
+S = "${WORKDIR}/git"
+
+PV = "1.99+gitr${SRCPV}"
+SRCREV_westeros = "c539ce0a7044b4396c36cdb609067c5d3b1761bf"
+
+
+DEPENDS = "wayland virtual/egl libxkbcommon westeros"
+
+REQUIRED_DISTRO_FEATURES += "wayland"
+
+inherit autotools pkgconfig features_check
+
+PACKAGECONFIG ??= "westeros resmgr"
+PACKAGECONFIG[westeros] = "--disable-essoswesterosfree,--enable-essoswesterosfree,westeros-simpleshell virtual/westeros-soc"
+PACKAGECONFIG[resmgr] = "--disable-essosresmgrfree,--enable-essosresmgrfree"
+
+# Specify any options you want to pass to the configure script using EXTRA_OECONF:
+EXTRA_OECONF = ""
+
+RPROVIDES:${PN} = "ermgr"
+RREPLACES:${PN} = "ermgr"
+RCONFLICTS:${PN} = "ermgr"
+
+acpaths = "-I cfg"
+
+do_install:append() {
+
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${S}/conf/ermgr.service ${D}${systemd_unitdir}/system
+
+   if ${@bb.utils.contains('DISTRO_FEATURES', 'use_westeros_essrmgr_uds', 'true', 'false', d)}; then
+       sed -i "/^Before=/ s/ audioserver.service tvserver.service$//" ${D}${systemd_unitdir}/system/ermgr.service
+       sed -i "/^WantedBy=/ s/ui-init.target$/wpeframework.service/" ${D}${systemd_unitdir}/system/ermgr.service
+   fi
+   # appsservice expects ERM UDS in /tmp folder
+   sed -i "/^Environment=\"XDG_RUNTIME_DIR/ s/run\"$/tmp\"/" ${D}${systemd_unitdir}/system/ermgr.service
+
+}
+
+SYSTEMD_SERVICE:${PN} += "ermgr.service"
+FILES:${PN} += "${systemd_unitdir}/system/*.service"
+
diff --git a/recipes-graphics/westeros/essos.bb b/recipes-graphics/westeros/essos.bb
index 7b9eec4a..5d0398b4 100644
--- a/recipes-graphics/westeros/essos.bb
+++ b/recipes-graphics/westeros/essos.bb
@@ -1,12 +1,19 @@
-include westeros.inc
-
 SUMMARY = "Essos is a library making it simple to create applications that run either as native EGL or Wayland clients."
 LICENSE = "Apache-2.0"
-LICENSE_LOCATION = "${S}/../LICENSE"
+LICENSE_LOCATION = "${S}/LICENSE"
+LIC_FILES_CHKSUM = "file://${LICENSE_LOCATION};md5=8fb65319802b0c15fc9e0835350ffa02"
+
+SRC_URI = "git://github.com/rdkcentral/essos;protocol=https;nobranch=1"
+
+PV = "1.0+gitr${SRCPV}"
+# Tip of westeros master as of Jan 12 2026 Westeros 2.0.0
+SRCREV_westeros = "f1c893419a8f2387d995ef56bbad7072b4d80337"
+
+S = "${WORKDIR}/git"
 
-S = "${WORKDIR}/git/essos"
+DEPENDS = "wayland virtual/egl libxkbcommon essosrmgr westeros"
 
-DEPENDS = "wayland virtual/egl libxkbcommon"
+DEBIAN_NOAUTONAME:${PN} = "1"
 
 REQUIRED_DISTRO_FEATURES += "wayland"
 
diff --git a/recipes-graphics/westeros/westeros-simplebuffer.bb b/recipes-graphics/westeros/westeros-simplebuffer.bb
index fbddffb7..82ccc8ea 100644
--- a/recipes-graphics/westeros/westeros-simplebuffer.bb
+++ b/recipes-graphics/westeros/westeros-simplebuffer.bb
@@ -1,12 +1,17 @@
-include westeros.inc
-
-SUMMARY = "This receipe compiles the westeros compositor simple-buffer component"
+SUMMARY = "This recipe compiles the westeros compositor simple-buffer component"
 
 LICENSE = "Apache-2.0"
 
 S = "${WORKDIR}/git/simplebuffer"
 
+SRC_URI = "git://github.com/rdkcentral/westeros;protocol=https;nobranch=1"
+
+PV = "1.0+gitr${SRCPV}"
+# Tip of westeros master as of Jan 12 2026 Westeros 2.0.0
+SRCREV_westeros = "0228f9e85fd0c44b85cf4af532c627dbf3d9b518"
+
 LICENSE_LOCATION = "${S}/../LICENSE"
+LIC_FILES_CHKSUM = "file://${LICENSE_LOCATION};md5=8fb65319802b0c15fc9e0835350ffa02"
 
 DEPENDS = "wayland glib-2.0 wayland-native"
 
diff --git a/recipes-graphics/westeros/westeros-simpleshell.bb b/recipes-graphics/westeros/westeros-simpleshell.bb
index c4d5fe6a..96af9ae2 100644
--- a/recipes-graphics/westeros/westeros-simpleshell.bb
+++ b/recipes-graphics/westeros/westeros-simpleshell.bb
@@ -1,11 +1,16 @@
-include westeros.inc
-
-SUMMARY = "This receipe compiles the westeros compositor simple-shell component"
+SUMMARY = "This recipe compiles the westeros compositor simple-shell component"
 
 LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${LICENSE_LOCATION};md5=8fb65319802b0c15fc9e0835350ffa02"
 
 S = "${WORKDIR}/git/simpleshell"
 
+SRC_URI = "git://github.com/rdkcentral/westeros;protocol=https;nobranch=1"
+
+PV = "1.0+gitr${SRCPV}"
+# Tip of westeros master as of Jan 12 2026 Westeros 2.0.0
+SRCREV_westeros = "0228f9e85fd0c44b85cf4af532c627dbf3d9b518"
+
 DEPENDS = "wayland glib-2.0 wayland-native"
 
 LICENSE_LOCATION = "${S}/../LICENSE"
diff --git a/recipes-graphics/westeros/westeros.bb b/recipes-graphics/westeros/westeros.bb
index 6c5cafec..8f6eb0ec 100644
--- a/recipes-graphics/westeros/westeros.bb
+++ b/recipes-graphics/westeros/westeros.bb
@@ -1,8 +1,14 @@
-include westeros.inc
-
 SUMMARY = "This receipe compiles the westeros compositor component"
 
 LICENSE = "Apache-2.0"
+LICENSE_LOCATION = "${S}/LICENSE"
+LIC_FILES_CHKSUM = "file://${LICENSE_LOCATION};md5=8fb65319802b0c15fc9e0835350ffa02"
+
+SRC_URI = "git://github.com/rdkcentral/westeros;protocol=https;nobranch=1"
+
+PV = "1.0+gitr${SRCPV}"
+# Tip of westeros master as of Jan 12 2026 Westeros 2.0.0
+SRCREV_westeros = "0228f9e85fd0c44b85cf4af532c627dbf3d9b518"
 
 PACKAGECONFIG ??= "incapp inctest increndergl incsbprotocol xdgv4"
 PACKAGECONFIG[incapp] = "--enable-app=yes"
@@ -36,3 +42,9 @@ do_compile:prepend() {
    oe_runmake -C ${S}/linux-dmabuf/protocol
    oe_runmake -C ${S}/linux-expsync/protocol
 }
+
+do_install:append() {
+    install -m 0644 ${S}/*.h ${D}${includedir}/
+}
+
+FILES_${PN}-dev += "${includedir}/*.h"