Update manifests to use feature/kavia-test branch

oe-layers.xml

diff --git a/oe-layers.xml b/oe-layers.xml
index bb0d485..ebffd3d 100644
--- a/oe-layers.xml
+++ b/oe-layers.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- AUTOGENERATED - PLEASE DO NOT MODIFY -->
 <manifest>
-    <project name="rdk/components/opensource/oe/bitbake" path="openembedded-core/bitbake" revision="rdk/kirkstone"/>
-    <project name="rdk/components/opensource/oe/meta-clang" path="meta-clang" revision="rdk/kirkstone"/>
-    <project name="rdk/components/opensource/oe/meta-gplv2" path="meta-gplv2" revision="kirkstone"/>
-    <project name="rdk/components/opensource/oe/meta-jz-mips" path="meta-jz-mips" revision="master"/>
-    <project name="rdk/components/opensource/oe/meta-openembedded" path="meta-openembedded" revision="rdk/kirkstone"/>
-    <project name="rdk/components/opensource/oe/meta-virtualization" path="meta-virtualization" revision="rdk/kirkstone"/>
-    <project name="rdk/components/opensource/oe/openembedded-core" path="openembedded-core" revision="rdk/kirkstone"/>
+    <project name="rdk/components/opensource/oe/bitbake" path="openembedded-core/bitbake" revision="feature/kavia-test"/>
+    <project name="rdk/components/opensource/oe/meta-clang" path="meta-clang" revision="feature/kavia-test"/>
+    <project name="rdk/components/opensource/oe/meta-gplv2" path="meta-gplv2" revision="feature/kavia-test"/>
+    <project name="rdk/components/opensource/oe/meta-jz-mips" path="meta-jz-mips" revision="feature/kavia-test"/>
+    <project name="rdk/components/opensource/oe/meta-openembedded" path="meta-openembedded" revision="feature/kavia-test"/>
+    <project name="rdk/components/opensource/oe/meta-virtualization" path="meta-virtualization" revision="feature/kavia-test"/>
+    <project name="rdk/components/opensource/oe/openembedded-core" path="openembedded-core" revision="feature/kavia-test"/>
 </manifest>

rdkb-bpi-ap-extsrc.xml

diff --git a/rdkb-bpi-ap-extsrc.xml b/rdkb-bpi-ap-extsrc.xml
index 27f4f7b..09dbe3f 100644
--- a/rdkb-bpi-ap-extsrc.xml
+++ b/rdkb-bpi-ap-extsrc.xml
@@ -5,18 +5,18 @@
     <remote name="github" fetch="https://github.com" review=""/>
     <remote name="yocto" fetch="http://git.yoctoproject.org/git" review=""/>
     <remote name="openembedded" fetch="https://git.openembedded.org" review=""/>
-    <default remote="cmf" revision="master" sync-j="2"/>
+    <default remote="cmf" revision="feature/kavia-test" sync-j="2"/>
     <include name="oe-layers.xml"/>
     <project name="mediatek/meta-cmf-filogic" remote="github" path="meta-cmf-filogic" revision="211fa3d81ae19cc5c6be731d52b1aa6733336b71"/>
     <project name="mediatek/meta-filogic" remote="github" path="meta-filogic" revision="c67a32a7c8876b328a8d1eeaca213e860d85b3ce"/>
     <project name="meta-lts-mixins" remote="yocto" revision="75c503be95d147a846bf02461fd975e74c1abe6f" upstream="kirkstone/rust"/>
-    <project name="rdk/components/generic/WebconfigFramework" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext" revision="rdk-next"/>
-    <project name="rdkcentral/meta-cmf-bananapi" remote="github" path="meta-cmf-bananapi" revision="develop"/>
-    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan" revision="main"/>
+    <project name="rdk/components/generic/WebconfigFramework"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext"/>
+    <project name="rdkcentral/meta-cmf-bananapi" remote="github" path="meta-cmf-bananapi"/>
+    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan"/>
 </manifest>

rdkb-bpi-extsrc.xml

diff --git a/rdkb-bpi-extsrc.xml b/rdkb-bpi-extsrc.xml
index 7bee406..1da3dcc 100644
--- a/rdkb-bpi-extsrc.xml
+++ b/rdkb-bpi-extsrc.xml
@@ -5,41 +5,41 @@
     <remote name="github" fetch="https://github.com" review=""/>
     <remote name="yocto" fetch="http://git.yoctoproject.org/git" review=""/>
     <remote name="openembedded" fetch="https://git.openembedded.org" review=""/>
-    <default remote="cmf" revision="master" sync-j="2"/>
+    <default remote="cmf" revision="feature/kavia-test" sync-j="2"/>
     <include name="oe-layers.xml"/>
     <project name="components/opensource/OMI"/>
     <project name="components/opensource/gdbus-client"/>
     <project name="mediatek/meta-cmf-filogic" remote="github" path="meta-cmf-filogic" revision="211fa3d81ae19cc5c6be731d52b1aa6733336b71"/>
     <project name="mediatek/meta-filogic" remote="github" path="meta-filogic" revision="c67a32a7c8876b328a8d1eeaca213e860d85b3ce"/>
     <project name="meta-lts-mixins" remote="yocto" revision="75c503be95d147a846bf02461fd975e74c1abe6f" upstream="kirkstone/rust"/>
-    <project name="rdk/components/generic/WebconfigFramework" revision="rdk-next"/>
-    <project name="rdk/components/generic/cpuprocanalyzer" revision="rdk-next"/>
-    <project name="rdk/components/generic/dca" revision="rdk-next"/>
-    <project name="rdk/components/generic/dcm" revision="rdk-next"/>
+    <project name="rdk/components/generic/WebconfigFramework"/>
+    <project name="rdk/components/generic/cpuprocanalyzer"/>
+    <project name="rdk/components/generic/dca"/>
+    <project name="rdk/components/generic/dcm"/>
     <project name="rdk/components/generic/lxc-container-generator"/>
     <project name="rdk/components/generic/lxccpid"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdkssa" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/mem_analyser_tools" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/sys_resource" revision="rdk-next"/>
-    <project name="rdk/components/generic/syslog_helper" revision="rdk-next"/>
-    <project name="rdk/devices/raspberrypi/webpa-client" revision="rdk-next"/>
-    <project name="rdkb/components/generic/sso" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspEPONAgent" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspWifiAgent" revision="main"/>
-    <project name="rdkb/components/opensource/ccsp/FirmwareSanity" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/GwProvApp-ePON" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/PlatformManager" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/rdkbemu_xb3" path="rdkb/components/opensource/ccsp/xb3" revision="rdk-next"/>
-    <project name="rdkcentral/hal-voice-asterisk" remote="github" path="components/opensource/hal-voice-asterisk" revision="develop"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext"/>
+    <project name="rdk/components/generic/rdkssa"/>
+    <project name="rdk/components/generic/sys_mon_tools/mem_analyser_tools"/>
+    <project name="rdk/components/generic/sys_mon_tools/sys_resource"/>
+    <project name="rdk/components/generic/syslog_helper"/>
+    <project name="rdk/devices/raspberrypi/webpa-client"/>
+    <project name="rdkb/components/generic/sso"/>
+    <project name="rdkb/components/opensource/ccsp/CcspEPONAgent"/>
+    <project name="rdkb/components/opensource/ccsp/CcspWifiAgent"/>
+    <project name="rdkb/components/opensource/ccsp/FirmwareSanity"/>
+    <project name="rdkb/components/opensource/ccsp/GwProvApp-ePON"/>
+    <project name="rdkb/components/opensource/ccsp/PlatformManager"/>
+    <project name="rdkb/devices/rdkbemu/rdkbemu_xb3" path="rdkb/components/opensource/ccsp/xb3"/>
+    <project name="rdkcentral/hal-voice-asterisk" remote="github" path="components/opensource/hal-voice-asterisk"/>
     <project name="rdkcentral/hal-wifi-cfg80211" remote="github" path="components/opensource/hal-wifi-cfg80211"/>
-    <project name="rdkcentral/meta-cmf-bananapi" remote="github" path="meta-cmf-bananapi" revision="develop"/>
-    <project name="rdkcentral/meta-rdk-broadband-apps" remote="github" path="meta-rdk-broadband-apps" revision="main"/>
-    <project name="rdkcentral/meta-rdk-iot" remote="github" path="meta-rdk-iot" revision="develop"/>
-    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan" revision="main"/>
+    <project name="rdkcentral/meta-cmf-bananapi" remote="github" path="meta-cmf-bananapi"/>
+    <project name="rdkcentral/meta-rdk-broadband-apps" remote="github" path="meta-rdk-broadband-apps"/>
+    <project name="rdkcentral/meta-rdk-iot" remote="github" path="meta-rdk-iot"/>
+    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan"/>
 </manifest>

rdkb-bpi-nosrc.xml

diff --git a/rdkb-bpi-nosrc.xml b/rdkb-bpi-nosrc.xml
index 0ae5bec..acab281 100644
--- a/rdkb-bpi-nosrc.xml
+++ b/rdkb-bpi-nosrc.xml
@@ -5,19 +5,19 @@
     <remote name="github" fetch="https://github.com" review=""/>
     <remote name="yocto" fetch="http://git.yoctoproject.org/git" review=""/>
     <remote name="openembedded" fetch="https://git.openembedded.org" review=""/>
-    <default remote="cmf" revision="master" sync-j="2"/>
+    <default remote="cmf" revision="feature/kavia-test" sync-j="2"/>
     <include name="oe-layers.xml"/>
     <project name="mediatek/meta-cmf-filogic" remote="github" path="meta-cmf-filogic" revision="211fa3d81ae19cc5c6be731d52b1aa6733336b71"/>
     <project name="mediatek/meta-filogic" remote="github" path="meta-filogic" revision="c67a32a7c8876b328a8d1eeaca213e860d85b3ce"/>
     <project name="meta-lts-mixins" remote="yocto" revision="75c503be95d147a846bf02461fd975e74c1abe6f" upstream="kirkstone/rust"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext" revision="rdk-next"/>
-    <project name="rdkcentral/meta-cmf-bananapi" remote="github" path="meta-cmf-bananapi" revision="develop"/>
-    <project name="rdkcentral/meta-rdk-broadband-apps" remote="github" path="meta-rdk-broadband-apps" revision="main"/>
-    <project name="rdkcentral/meta-rdk-iot" remote="github" path="meta-rdk-iot" revision="develop"/>
-    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan" revision="main"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext"/>
+    <project name="rdkcentral/meta-cmf-bananapi" remote="github" path="meta-cmf-bananapi"/>
+    <project name="rdkcentral/meta-rdk-broadband-apps" remote="github" path="meta-rdk-broadband-apps"/>
+    <project name="rdkcentral/meta-rdk-iot" remote="github" path="meta-rdk-iot"/>
+    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan"/>
 </manifest>

rdkb-extsrc.xml

diff --git a/rdkb-extsrc.xml b/rdkb-extsrc.xml
index e87701d..273d338 100644
--- a/rdkb-extsrc.xml
+++ b/rdkb-extsrc.xml
@@ -5,45 +5,45 @@
     <remote name="github" fetch="https://github.com" review=""/>
     <remote name="yocto" fetch="http://git.yoctoproject.org" review=""/>
     <remote name="openembedded" fetch="https://git.openembedded.org" review=""/>
-    <default remote="cmf" revision="master" sync-j="2"/>
+    <default remote="cmf" revision="feature/kavia-test" sync-j="2"/>
     <include name="oe-layers.xml"/>
     <project name="components/opensource/OMI"/>
     <project name="components/opensource/gdbus-client"/>
-    <project name="rdk/components/generic/WebconfigFramework" revision="rdk-next"/>
-    <project name="rdk/components/generic/cpuprocanalyzer" revision="rdk-next"/>
-    <project name="rdk/components/generic/dca" revision="rdk-next"/>
-    <project name="rdk/components/generic/dcm" revision="rdk-next"/>
+    <project name="rdk/components/generic/WebconfigFramework"/>
+    <project name="rdk/components/generic/cpuprocanalyzer"/>
+    <project name="rdk/components/generic/dca"/>
+    <project name="rdk/components/generic/dcm"/>
     <project name="rdk/components/generic/lxc-container-generator"/>
     <project name="rdk/components/generic/lxccpid"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-raspberrypi" path="meta-cmf-raspberrypi" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdkssa" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/mem_analyser_tools" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/sys_resource" revision="rdk-next"/>
-    <project name="rdk/components/generic/syslog_helper" revision="rdk-next"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="kirkstone"/>
-    <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi" revision="rdk/morty"/>
-    <project name="rdk/devices/raspberrypi/webpa-client" revision="rdk-next"/>
-    <project name="rdkb/components/generic/CcspLogAgent" revision="rdk-next"/>
-    <project name="rdkb/components/generic/sso" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspEPONAgent" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspWifiAgent" revision="main"/>
-    <project name="rdkb/components/opensource/ccsp/FirmwareSanity" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/GwProvApp-ePON" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/PlatformManager" revision="rdk-next"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-raspberrypi" path="meta-cmf-raspberrypi"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext"/>
+    <project name="rdk/components/generic/rdkssa"/>
+    <project name="rdk/components/generic/sys_mon_tools/mem_analyser_tools"/>
+    <project name="rdk/components/generic/sys_mon_tools/sys_resource"/>
+    <project name="rdk/components/generic/syslog_helper"/>
+    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi"/>
+    <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi"/>
+    <project name="rdk/devices/raspberrypi/webpa-client"/>
+    <project name="rdkb/components/generic/CcspLogAgent"/>
+    <project name="rdkb/components/generic/sso"/>
+    <project name="rdkb/components/opensource/ccsp/CcspEPONAgent"/>
+    <project name="rdkb/components/opensource/ccsp/CcspWifiAgent"/>
+    <project name="rdkb/components/opensource/ccsp/FirmwareSanity"/>
+    <project name="rdkb/components/opensource/ccsp/GwProvApp-ePON"/>
+    <project name="rdkb/components/opensource/ccsp/PlatformManager"/>
     <project name="rdkb/devices/ci20/hal"/>
-    <project name="rdkb/devices/emulator/hal" revision="rdk-next"/>
-    <project name="rdkb/devices/intel-x86-pc/emulator/sysint" path="rdkb/components/opensource/ccsp/sysint/device" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/sysint" path="rdkb/components/opensource/ccsp/sysint/devicerpi" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/rdkbemu_xb3" path="rdkb/components/opensource/ccsp/xb3" revision="rdk-next"/>
+    <project name="rdkb/devices/emulator/hal"/>
+    <project name="rdkb/devices/intel-x86-pc/emulator/sysint" path="rdkb/components/opensource/ccsp/sysint/device"/>
+    <project name="rdkb/devices/raspberrypi/sysint" path="rdkb/components/opensource/ccsp/sysint/devicerpi"/>
+    <project name="rdkb/devices/rdkbemu/rdkbemu_xb3" path="rdkb/components/opensource/ccsp/xb3"/>
     <project name="rdkb/docs"/>
-    <project name="rdkcentral/hal-voice-asterisk" remote="github" path="components/opensource/hal-voice-asterisk" revision="develop"/>
+    <project name="rdkcentral/hal-voice-asterisk" remote="github" path="components/opensource/hal-voice-asterisk"/>
     <project name="rdkcentral/hal-wifi-cfg80211" remote="github" path="components/opensource/hal-wifi-cfg80211"/>
-    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan" revision="main"/>
+    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan"/>
     <project name="rdkcentral/rdkb-emu-hal" remote="github" path="rdkb/devices/rdkbemu/hal"/>
 </manifest>

rdkb-nosrc.xml

diff --git a/rdkb-nosrc.xml b/rdkb-nosrc.xml
index ab4e090..122f20a 100644
--- a/rdkb-nosrc.xml
+++ b/rdkb-nosrc.xml
@@ -5,17 +5,17 @@
     <remote name="github" fetch="https://github.com" review=""/>
     <remote name="yocto" fetch="http://git.yoctoproject.org" review=""/>
     <remote name="openembedded" fetch="https://git.openembedded.org" review=""/>
-    <default remote="cmf" revision="master" sync-j="2"/>
+    <default remote="cmf" revision="feature/kavia-test" sync-j="2"/>
     <include name="oe-layers.xml"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-raspberrypi" path="meta-cmf-raspberrypi" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext" revision="rdk-next"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="kirkstone"/>
-    <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi" revision="rdk/morty"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-raspberrypi" path="meta-cmf-raspberrypi"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext"/>
+    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi"/>
+    <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi"/>
     <project name="rdkb/docs"/>
-    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan" revision="main"/>
+    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan"/>
 </manifest>

rdkb-pod-extsrc.xml

diff --git a/rdkb-pod-extsrc.xml b/rdkb-pod-extsrc.xml
index 22ebc0a..db75e60 100644
--- a/rdkb-pod-extsrc.xml
+++ b/rdkb-pod-extsrc.xml
@@ -5,21 +5,21 @@
     <remote name="github" fetch="https://github.com" review=""/>
     <remote name="yocto" fetch="http://git.yoctoproject.org" review=""/>
     <remote name="openembedded" fetch="https://git.openembedded.org" review=""/>
-    <default remote="cmf" revision="master" sync-j="2"/>
+    <default remote="cmf" revision="feature/kavia-test" sync-j="2"/>
     <include name="oe-layers.xml"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-raspberrypi" path="meta-cmf-raspberrypi" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/mem_analyser_tools" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/sys_resource" revision="rdk-next"/>
-    <project name="rdk/components/generic/syslog_helper" revision="rdk-next"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="kirkstone"/>
-    <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi" revision="rdk/morty"/>
-    <project name="rdkcentral/hal-voice-asterisk" remote="github" path="components/opensource/hal-voice-asterisk" revision="develop"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-raspberrypi" path="meta-cmf-raspberrypi"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext"/>
+    <project name="rdk/components/generic/sys_mon_tools/mem_analyser_tools"/>
+    <project name="rdk/components/generic/sys_mon_tools/sys_resource"/>
+    <project name="rdk/components/generic/syslog_helper"/>
+    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi"/>
+    <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi"/>
+    <project name="rdkcentral/hal-voice-asterisk" remote="github" path="components/opensource/hal-voice-asterisk"/>
     <project name="rdkcentral/hal-wifi-cfg80211" remote="github" path="components/opensource/hal-wifi-cfg80211"/>
-    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan" revision="main"/>
+    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan"/>
 </manifest>

rdkb-pod-nosrc.xml

diff --git a/rdkb-pod-nosrc.xml b/rdkb-pod-nosrc.xml
index 178c28a..158fb59 100644
--- a/rdkb-pod-nosrc.xml
+++ b/rdkb-pod-nosrc.xml
@@ -5,16 +5,16 @@
     <remote name="github" fetch="https://github.com" review=""/>
     <remote name="yocto" fetch="http://git.yoctoproject.org" review=""/>
     <remote name="openembedded" fetch="https://git.openembedded.org" review=""/>
-    <default remote="cmf" revision="master" sync-j="2"/>
+    <default remote="cmf" revision="feature/kavia-test" sync-j="2"/>
     <include name="oe-layers.xml"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf-raspberrypi" path="meta-cmf-raspberrypi" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext" revision="rdk-next"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="kirkstone"/>
-    <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi" revision="rdk/morty"/>
-    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan" revision="main"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-broadband" path="meta-cmf-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-mesh" path="meta-cmf-mesh"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf-raspberrypi" path="meta-cmf-raspberrypi"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk" path="meta-rdk"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-broadband" path="meta-rdk-broadband"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext"/>
+    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi"/>
+    <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi"/>
+    <project name="rdkcentral/meta-rdk-wan" remote="github" path="meta-rdk-wan"/>
 </manifest>