diff --git a/conf/template/bblayers.conf.sample b/conf/template/bblayers.conf.sample
index 750fdf03..942d731c 100644
--- a/conf/template/bblayers.conf.sample
+++ b/conf/template/bblayers.conf.sample
@@ -59,6 +59,8 @@ BBLAYERS =+ " \
     ${@d.getVar('MANIFEST_PATH_RDK_CPC_HALIF_HEADERS') if d.getVar('MANIFEST_PATH_RDK_CPC_HALIF_HEADERS') is not None and os.path.isfile(d.getVar('MANIFEST_PATH_RDK_CPC_HALIF_HEADERS') + '/conf/layer.conf') else ''} \
     ${@d.getVar('MANIFEST_PATH_RDK_TOOLS') if d.getVar('MANIFEST_PATH_RDK_TOOLS') is not None and os.path.isfile(d.getVar('MANIFEST_PATH_RDK_TOOLS') + '/conf/layer.conf') else ''} \
     ${@d.getVar('MANIFEST_PATH_MIDDLEWARE_BRINGUP') if d.getVar('MANIFEST_PATH_MIDDLEWARE_BRINGUP') is not None and os.path.isfile(d.getVar('MANIFEST_PATH_MIDDLEWARE_BRINGUP') + '/conf/layer.conf') else ''} \
+    ${@d.getVar('MANIFEST_PATH_RDK_IMAGES') if d.getVar('MANIFEST_PATH_RDK_IMAGES') is not None and os.path.isfile(d.getVar('MANIFEST_PATH_RDK_IMAGES') + '/conf/layer.conf') else ''} \
+    ${@d.getVar('MANIFEST_PATH_CSPC_IMAGES') if d.getVar('MANIFEST_PATH_CSPC_IMAGES') is not None and os.path.isfile(d.getVar('MANIFEST_PATH_CSPC_IMAGES') + '/conf/layer.conf') else ''} \
     "
 
 # Config layers: generic
diff --git a/recipes-common/systimemgr/systimemgr_git.bb b/recipes-common/systimemgr/systimemgr_git.bb
index c7bd5307..63fe8e8d 100755
--- a/recipes-common/systimemgr/systimemgr_git.bb
+++ b/recipes-common/systimemgr/systimemgr_git.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Timer , publishing and subscription interfaces."
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-DEPENDS = "systimemgrinetrface systimemgrfactory rdk-logger libsyswrapper wpeframework-clientlibraries"
+DEPENDS = "systimemgrinetrface systimemgrfactory rdk-logger libsyswrapper wpeframework-clientlibraries  telemetry"
 
 SRC_URI = "${CMF_GITHUB_ROOT}/systemtimemgr;${CMF_GITHUB_SRC_URI_SUFFIX};name=systemtimemgr"
 
@@ -30,6 +30,7 @@ SYSLOG-NG_LOGRATE_systimemgr = "low"
 
 RDEPENDS:${PN} += "systimemgrfactory"
 
+EXTRA_OECONF = "--enable-t2api=yes"
 do_install:append() {
    install -d ${D}${systemd_unitdir}/system
    install -d ${D}${systemd_unitdir}/system/systimemgr.service.d
diff --git a/recipes-common/systimemgr/systimemgrfactory_git.bb b/recipes-common/systimemgr/systimemgrfactory_git.bb
index be7e9311..8232ed8f 100755
--- a/recipes-common/systimemgr/systimemgrfactory_git.bb
+++ b/recipes-common/systimemgr/systimemgrfactory_git.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Timer , publishing and subscription interfaces."
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-DEPENDS = "systimemgrinetrface iarmbus jsonrpc virtual/mfrlib rdk-logger"
+DEPENDS = "systimemgrinetrface iarmbus jsonrpc virtual/mfrlib rdk-logger telemetry"
 
 
 SRC_URI = "${CMF_GITHUB_ROOT}/systemtimemgr;${CMF_GITHUB_SRC_URI_SUFFIX};name=systemtimemgrfactory"
@@ -31,5 +31,4 @@ inherit autotools pkgconfig
 RDEPENDS:${PN} += " jsonrpc curl jsoncpp "
 DEPENDS += " iarmmgrs wpeframework wpeframework-clientlibraries"
 
-EXTRA_OECONF:append = " --enable-wpevgdrm --enable-dtt "
-
+EXTRA_OECONF:append = " --enable-wpevgdrm --enable-dtt --enable-t2api=yes"