Update manifests to use nightly/20250107-kirkstone branch

oe-layers.xml

diff --git a/oe-layers.xml b/oe-layers.xml
index bb0d485..c0b70ee 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="nightly/20250107-kirkstone"/>
+    <project name="rdk/components/opensource/oe/meta-clang" path="meta-clang" revision="nightly/20250107-kirkstone"/>
+    <project name="rdk/components/opensource/oe/meta-gplv2" path="meta-gplv2" revision="nightly/20250107-kirkstone"/>
+    <project name="rdk/components/opensource/oe/meta-jz-mips" path="meta-jz-mips" revision="nightly/20250107-kirkstone"/>
+    <project name="rdk/components/opensource/oe/meta-openembedded" path="meta-openembedded" revision="nightly/20250107-kirkstone"/>
+    <project name="rdk/components/opensource/oe/meta-virtualization" path="meta-virtualization" revision="nightly/20250107-kirkstone"/>
+    <project name="rdk/components/opensource/oe/openembedded-core" path="openembedded-core" revision="nightly/20250107-kirkstone"/>
 </manifest>

rdkb-extsrc.xml

diff --git a/rdkb-extsrc.xml b/rdkb-extsrc.xml
index 2df9471..b5c04aa 100644
--- a/rdkb-extsrc.xml
+++ b/rdkb-extsrc.xml
@@ -5,126 +5,126 @@
     <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="nightly/20250107-kirkstone" sync-j="2"/>
     <include name="oe-layers.xml"/>
     <project name="components/opensource/OMI"/>
     <project name="components/opensource/gdbus-client"/>
     <project name="plume-design/meta-rdk-opensync" remote="github" path="meta-rdk-opensync" revision="osync_4.4.0"/>
-    <project name="rdk/components/generic/OvsAgent" revision="rdk-next"/>
-    <project name="rdk/components/generic/WebconfigFramework" revision="rdk-next"/>
-    <project name="rdk/components/generic/breakpad_wrapper" revision="rdk-next"/>
-    <project name="rdk/components/generic/cpuprocanalyzer" revision="rdk-next"/>
-    <project name="rdk/components/generic/crashupload" 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/jst" revision="rdk-next"/>
-    <project name="rdk/components/generic/libSyscallWrapper" revision="rdk-next"/>
-    <project name="rdk/components/generic/libunpriv" revision="rdk-next"/>
+    <project name="rdk/components/generic/OvsAgent"/>
+    <project name="rdk/components/generic/WebconfigFramework"/>
+    <project name="rdk/components/generic/breakpad_wrapper"/>
+    <project name="rdk/components/generic/cpuprocanalyzer"/>
+    <project name="rdk/components/generic/crashupload"/>
+    <project name="rdk/components/generic/dca"/>
+    <project name="rdk/components/generic/dcm"/>
+    <project name="rdk/components/generic/jst"/>
+    <project name="rdk/components/generic/libSyscallWrapper"/>
+    <project name="rdk/components/generic/libunpriv"/>
     <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/rdk_logger" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdkssa" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdm" revision="rdk-next"/>
-    <project name="rdk/components/generic/rfc" 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/generic/telemetry" revision="rdk-next"/>
-    <project name="rdk/components/generic/xupnp" revision="rdk-next"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="kirkstone"/>
+    <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/rdk_logger"/>
+    <project name="rdk/components/generic/rdkssa"/>
+    <project name="rdk/components/generic/rdm"/>
+    <project name="rdk/components/generic/rfc"/>
+    <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/generic/telemetry"/>
+    <project name="rdk/components/generic/xupnp"/>
+    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi"/>
     <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/harvester" revision="rdk-next"/>
-    <project name="rdkb/components/generic/json-rpc" revision="rdk-next"/>
-    <project name="rdkb/components/generic/mtu_modifier" revision="rdk-next"/>
-    <project name="rdkb/components/generic/notify_comp" revision="rdk-next"/>
-    <project name="rdkb/components/generic/sso" revision="rdk-next"/>
-    <project name="rdkb/components/generic/startParodus" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspAdvSecurity" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspCMAgent" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspCommonLibrary" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspCr" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspDmCli" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspEPONAgent" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspEthAgent" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspHomeSecurity" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspLMLite" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspMisc" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspMoCA" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspMtaAgent" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspPandM" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspPsm" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspSnmpPa" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CcspTr069Pa" revision="rdk-next"/>
+    <project name="rdk/devices/raspberrypi/webpa-client"/>
+    <project name="rdkb/components/generic/CcspLogAgent"/>
+    <project name="rdkb/components/generic/harvester"/>
+    <project name="rdkb/components/generic/json-rpc"/>
+    <project name="rdkb/components/generic/mtu_modifier"/>
+    <project name="rdkb/components/generic/notify_comp"/>
+    <project name="rdkb/components/generic/sso"/>
+    <project name="rdkb/components/generic/startParodus"/>
+    <project name="rdkb/components/opensource/ccsp/CcspAdvSecurity"/>
+    <project name="rdkb/components/opensource/ccsp/CcspCMAgent"/>
+    <project name="rdkb/components/opensource/ccsp/CcspCommonLibrary"/>
+    <project name="rdkb/components/opensource/ccsp/CcspCr"/>
+    <project name="rdkb/components/opensource/ccsp/CcspDmCli"/>
+    <project name="rdkb/components/opensource/ccsp/CcspEPONAgent"/>
+    <project name="rdkb/components/opensource/ccsp/CcspEthAgent"/>
+    <project name="rdkb/components/opensource/ccsp/CcspHomeSecurity"/>
+    <project name="rdkb/components/opensource/ccsp/CcspLMLite"/>
+    <project name="rdkb/components/opensource/ccsp/CcspMisc"/>
+    <project name="rdkb/components/opensource/ccsp/CcspMoCA"/>
+    <project name="rdkb/components/opensource/ccsp/CcspMtaAgent"/>
+    <project name="rdkb/components/opensource/ccsp/CcspPandM"/>
+    <project name="rdkb/components/opensource/ccsp/CcspPsm"/>
+    <project name="rdkb/components/opensource/ccsp/CcspSnmpPa"/>
+    <project name="rdkb/components/opensource/ccsp/CcspTr069Pa"/>
     <project name="rdkb/components/opensource/ccsp/CcspWifiAgent" revision="main"/>
-    <project name="rdkb/components/opensource/ccsp/CcspXDNS" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/CoreNetLib" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/DhcpManager" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/FirmwareSanity" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/GwProvApp" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/GwProvApp-EthWan" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/GwProvApp-ePON" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/LanManager" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/MeshAgent" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/OneWifi" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/PlatformManager" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/PowerManager" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/RdkCellularManager" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/RdkCellularManager-MM" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/RdkInterDeviceManager" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/RdkLedManager" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/RdkPlatformManager" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/RdkTelcoVoiceManager" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/TestAndDiagnostic" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/Utopia" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/Xconf" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/hal" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/hal/rdk-wifi-hal" path="rdkb/components/opensource/ccsp/rdk-wifi-hal" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/halinterface" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/hotspot" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/sysint" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/webui" revision="rdk-next"/>
-    <project name="rdkb/components/opensource/ccsp/webui-bwg" revision="rdk-next"/>
+    <project name="rdkb/components/opensource/ccsp/CcspXDNS"/>
+    <project name="rdkb/components/opensource/ccsp/CoreNetLib"/>
+    <project name="rdkb/components/opensource/ccsp/DhcpManager"/>
+    <project name="rdkb/components/opensource/ccsp/FirmwareSanity"/>
+    <project name="rdkb/components/opensource/ccsp/GwProvApp"/>
+    <project name="rdkb/components/opensource/ccsp/GwProvApp-EthWan"/>
+    <project name="rdkb/components/opensource/ccsp/GwProvApp-ePON"/>
+    <project name="rdkb/components/opensource/ccsp/LanManager"/>
+    <project name="rdkb/components/opensource/ccsp/MeshAgent"/>
+    <project name="rdkb/components/opensource/ccsp/OneWifi"/>
+    <project name="rdkb/components/opensource/ccsp/PlatformManager"/>
+    <project name="rdkb/components/opensource/ccsp/PowerManager"/>
+    <project name="rdkb/components/opensource/ccsp/RdkCellularManager"/>
+    <project name="rdkb/components/opensource/ccsp/RdkCellularManager-MM"/>
+    <project name="rdkb/components/opensource/ccsp/RdkInterDeviceManager"/>
+    <project name="rdkb/components/opensource/ccsp/RdkLedManager"/>
+    <project name="rdkb/components/opensource/ccsp/RdkPlatformManager"/>
+    <project name="rdkb/components/opensource/ccsp/RdkTelcoVoiceManager"/>
+    <project name="rdkb/components/opensource/ccsp/TestAndDiagnostic"/>
+    <project name="rdkb/components/opensource/ccsp/Utopia"/>
+    <project name="rdkb/components/opensource/ccsp/Xconf"/>
+    <project name="rdkb/components/opensource/ccsp/hal"/>
+    <project name="rdkb/components/opensource/ccsp/hal/rdk-wifi-hal" path="rdkb/components/opensource/ccsp/rdk-wifi-hal"/>
+    <project name="rdkb/components/opensource/ccsp/halinterface"/>
+    <project name="rdkb/components/opensource/ccsp/hotspot"/>
+    <project name="rdkb/components/opensource/ccsp/sysint"/>
+    <project name="rdkb/components/opensource/ccsp/webui"/>
+    <project name="rdkb/components/opensource/ccsp/webui-bwg"/>
     <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/intel-x86-pc/emulator/tdkb" path="rdkb/tools/tdkb/platform/rdkbemulator" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/bridgeutil/devices_rpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/dhcpv4c/devices_rpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/ethsw/devices_rpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/platform/devices_rpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/wifi/devices_rpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/sysint" path="rdkb/components/opensource/ccsp/sysint/devicerpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/tdkb" path="rdkb/tools/tdkb/platform/raspberrypi" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/generic/CcspLogAgent/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/generic/harvester/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspCr/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspLMLite/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspPandM/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspPsm/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspSnmpPa/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspTr069Pa/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspWifiAgent/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/TestAndDiagnostic/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/Utopia/devices" revision="rdk-next"/>
-    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/hotspot/devices" 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/intel-x86-pc/emulator/tdkb" path="rdkb/tools/tdkb/platform/rdkbemulator"/>
+    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/bridgeutil/devices_rpi"/>
+    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/dhcpv4c/devices_rpi"/>
+    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/ethsw/devices_rpi"/>
+    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/platform/devices_rpi"/>
+    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/wifi/devices_rpi"/>
+    <project name="rdkb/devices/raspberrypi/hal"/>
+    <project name="rdkb/devices/raspberrypi/sysint" path="rdkb/components/opensource/ccsp/sysint/devicerpi"/>
+    <project name="rdkb/devices/raspberrypi/tdkb" path="rdkb/tools/tdkb/platform/raspberrypi"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/generic/CcspLogAgent/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/generic/harvester/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspCr/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspLMLite/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspPandM/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspPsm/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspSnmpPa/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspTr069Pa/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/CcspWifiAgent/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/TestAndDiagnostic/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/Utopia/devices"/>
+    <project name="rdkb/devices/rdkbemu/ccsp/rdkb" path="rdkb/components/opensource/ccsp/hotspot/devices"/>
+    <project name="rdkb/devices/rdkbemu/rdkbemu_xb3" path="rdkb/components/opensource/ccsp/xb3"/>
     <project name="rdkb/docs"/>
-    <project name="rdkb/tools/tdkb" revision="rdk-next"/>
-    <project name="rdkcentral/RdkEasyMeshController" remote="github" path="rdkb/components/opensource/ccsp/RdkEasyMeshController" revision="main"/>
-    <project name="rdkcentral/RdkEasyMeshControllerSSP" remote="github" path="rdkb/components/opensource/ccsp/RdkEasyMeshController/ssp" revision="main"/>
-    <project name="rdkcentral/hal-voice-asterisk" remote="github" path="components/opensource/hal-voice-asterisk" revision="main"/>
+    <project name="rdkb/tools/tdkb"/>
+    <project name="rdkcentral/RdkEasyMeshController" remote="github" path="rdkb/components/opensource/ccsp/RdkEasyMeshController"/>
+    <project name="rdkcentral/RdkEasyMeshControllerSSP" remote="github" path="rdkb/components/opensource/ccsp/RdkEasyMeshController/ssp"/>
+    <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"/>
-    <project name="rdkcentral/rdkb-halif-platform" remote="github" path="rdkb/components/opensource/ccsp/rdkb-halif-platform" revision="main"/>
+    <project name="rdkcentral/rdkb-halif-platform" remote="github" path="rdkb/components/opensource/ccsp/rdkb-halif-platform"/>
 </manifest>

rdkb-nosrc.xml

diff --git a/rdkb-nosrc.xml b/rdkb-nosrc.xml
index 5c4526a..26259a9 100644
--- a/rdkb-nosrc.xml
+++ b/rdkb-nosrc.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="nightly/20250107-kirkstone" sync-j="2"/>
     <include name="oe-layers.xml"/>
     <project name="plume-design/meta-rdk-opensync" remote="github" path="meta-rdk-opensync" revision="osync_4.4.0"/>
-    <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/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" revision="rdk/morty"/>
     <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 32a9ee1..e72898a 100644
--- a/rdkb-pod-extsrc.xml
+++ b/rdkb-pod-extsrc.xml
@@ -5,31 +5,31 @@
     <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="nightly/20250107-kirkstone" sync-j="2"/>
     <include name="oe-layers.xml"/>
     <project name="plume-design/meta-rdk-opensync" remote="github" path="meta-rdk-opensync" revision="osync_4.4.0"/>
-    <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/rdk_logger" 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/generic/xupnp" revision="rdk-next"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="kirkstone"/>
+    <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/rdk_logger"/>
+    <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/generic/xupnp"/>
+    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi"/>
     <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi" revision="rdk/morty"/>
-    <project name="rdkb/components/opensource/ccsp/halinterface" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/bridgeutil/devices_rpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/dhcpv4c/devices_rpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/ethsw/devices_rpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/platform/devices_rpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/wifi/devices_rpi" revision="rdk-next"/>
-    <project name="rdkb/devices/raspberrypi/hal" revision="rdk-next"/>
-    <project name="rdkcentral/hal-voice-asterisk" remote="github" path="components/opensource/hal-voice-asterisk" revision="main"/>
+    <project name="rdkb/components/opensource/ccsp/halinterface"/>
+    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/bridgeutil/devices_rpi"/>
+    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/dhcpv4c/devices_rpi"/>
+    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/ethsw/devices_rpi"/>
+    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/platform/devices_rpi"/>
+    <project name="rdkb/devices/raspberrypi/hal" path="rdkb/components/opensource/ccsp/hal/source/wifi/devices_rpi"/>
+    <project name="rdkb/devices/raspberrypi/hal"/>
+    <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 92d1342..71d616b 100644
--- a/rdkb-pod-nosrc.xml
+++ b/rdkb-pod-nosrc.xml
@@ -5,17 +5,17 @@
     <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="nightly/20250107-kirkstone" sync-j="2"/>
     <include name="oe-layers.xml"/>
     <project name="plume-design/meta-rdk-opensync" remote="github" path="meta-rdk-opensync" revision="osync_4.4.0"/>
-    <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/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" revision="rdk/morty"/>
-    <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>

rdkc-extsrc.xml

diff --git a/rdkc-extsrc.xml b/rdkc-extsrc.xml
index ec36321..6c8097f 100644
--- a/rdkc-extsrc.xml
+++ b/rdkc-extsrc.xml
@@ -5,45 +5,45 @@
     <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="nightly/20250107-kirkstone" sync-j="2"/>
     <include name="oe-layers.xml"/>
-    <project name="components/generic/rdk-oe/meta-cmf-camera" path="meta-cmf-camera" revision="rdk-next"/>
-    <project name="components/generic/rdk-oe/meta-cmf-video" path="meta-cmf-video" revision="rdk-next"/>
-    <project name="components/generic/rdk-oe/meta-rdk-camera" path="meta-rdk-camera" revision="rdk-next"/>
-    <project name="rdk/components/generic/breakpad_wrapper" revision="rdk-next"/>
-    <project name="rdk/components/generic/crashupload" revision="rdk-next"/>
-    <project name="rdk/components/generic/iarmbus" revision="rdk-next"/>
-    <project name="rdk/components/generic/libSyscallWrapper" revision="rdk-next"/>
-    <project name="rdk/components/generic/libunpriv" 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-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-ext" path="meta-rdk-ext" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-video" path="meta-rdk-video" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk_logger" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/rdklogctrl" revision="rdk-next"/>
-    <project name="rdk/components/generic/syslog_helper" revision="rdk-next"/>
-    <project name="rdk/components/generic/telemetry" revision="rdk-next"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="kirkstone"/>
+    <project name="components/generic/rdk-oe/meta-cmf-camera" path="meta-cmf-camera"/>
+    <project name="components/generic/rdk-oe/meta-cmf-video" path="meta-cmf-video"/>
+    <project name="components/generic/rdk-oe/meta-rdk-camera" path="meta-rdk-camera"/>
+    <project name="rdk/components/generic/breakpad_wrapper"/>
+    <project name="rdk/components/generic/crashupload"/>
+    <project name="rdk/components/generic/iarmbus"/>
+    <project name="rdk/components/generic/libSyscallWrapper"/>
+    <project name="rdk/components/generic/libunpriv"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <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-ext" path="meta-rdk-ext"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-video" path="meta-rdk-video"/>
+    <project name="rdk/components/generic/rdk_logger"/>
+    <project name="rdk/components/generic/sys_mon_tools/rdklogctrl"/>
+    <project name="rdk/components/generic/syslog_helper"/>
+    <project name="rdk/components/generic/telemetry"/>
+    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi"/>
     <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi" revision="rdk/morty"/>
-    <project name="rdk/components/opensource/sysint" revision="rdk-next"/>
-    <project name="rdk/devices/opensource/intel-x86-pc/emulator/sysint" path="rdk/components/opensource/sysint/device" revision="rdk-next"/>
-    <project name="rdk/devices/opensource/raspberrypi/sysint" path="rdk/components/opensource/sysint/devicerpi" revision="rdk-next"/>
-    <project name="rdk/devices/raspberrypi/devicesettings" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/camera-apps" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/camera-hal" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/camera/ledmgr" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/configMgr" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/cvr" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/httpClients" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/ledmgr" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/plugins" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/pwstream" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/rms" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/sensorhal" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/streamerhal" revision="rdk-next"/>
-    <project name="rdkc/components/opensource/thumbnail" revision="rdk-next"/>
-    <project name="rdkc/devices/raspberrypi/mediastreamer" revision="rdk-next"/>
-    <project name="rdkc/devices/raspberrypi/tdkc" path="rdkc/tools/tdkc/platform/raspberrypi" revision="rdk-next"/>
-    <project name="rdkc/tools/tdkc" revision="rdk-next"/>
+    <project name="rdk/components/opensource/sysint"/>
+    <project name="rdk/devices/opensource/intel-x86-pc/emulator/sysint" path="rdk/components/opensource/sysint/device"/>
+    <project name="rdk/devices/opensource/raspberrypi/sysint" path="rdk/components/opensource/sysint/devicerpi"/>
+    <project name="rdk/devices/raspberrypi/devicesettings"/>
+    <project name="rdkc/components/opensource/camera-apps"/>
+    <project name="rdkc/components/opensource/camera-hal"/>
+    <project name="rdkc/components/opensource/camera/ledmgr"/>
+    <project name="rdkc/components/opensource/configMgr"/>
+    <project name="rdkc/components/opensource/cvr"/>
+    <project name="rdkc/components/opensource/httpClients"/>
+    <project name="rdkc/components/opensource/ledmgr"/>
+    <project name="rdkc/components/opensource/plugins"/>
+    <project name="rdkc/components/opensource/pwstream"/>
+    <project name="rdkc/components/opensource/rms"/>
+    <project name="rdkc/components/opensource/sensorhal"/>
+    <project name="rdkc/components/opensource/streamerhal"/>
+    <project name="rdkc/components/opensource/thumbnail"/>
+    <project name="rdkc/devices/raspberrypi/mediastreamer"/>
+    <project name="rdkc/devices/raspberrypi/tdkc" path="rdkc/tools/tdkc/platform/raspberrypi"/>
+    <project name="rdkc/tools/tdkc"/>
 </manifest>

rdkc-nosrc.xml

diff --git a/rdkc-nosrc.xml b/rdkc-nosrc.xml
index 959a5c1..923ffbc 100644
--- a/rdkc-nosrc.xml
+++ b/rdkc-nosrc.xml
@@ -5,16 +5,16 @@
     <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="nightly/20250107-kirkstone" sync-j="2"/>
     <include name="oe-layers.xml"/>
-    <project name="components/generic/rdk-oe/meta-cmf-camera" path="meta-cmf-camera" revision="rdk-next"/>
-    <project name="components/generic/rdk-oe/meta-cmf-video" path="meta-cmf-video" revision="rdk-next"/>
-    <project name="components/generic/rdk-oe/meta-rdk-camera" path="meta-rdk-camera" 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-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-ext" path="meta-rdk-ext" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-video" path="meta-rdk-video" revision="rdk-next"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="kirkstone"/>
+    <project name="components/generic/rdk-oe/meta-cmf-camera" path="meta-cmf-camera"/>
+    <project name="components/generic/rdk-oe/meta-cmf-video" path="meta-cmf-video"/>
+    <project name="components/generic/rdk-oe/meta-rdk-camera" path="meta-rdk-camera"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <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-ext" path="meta-rdk-ext"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-video" path="meta-rdk-video"/>
+    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi"/>
     <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi" revision="rdk/morty"/>
 </manifest>

rdkv-extsrc.xml

diff --git a/rdkv-extsrc.xml b/rdkv-extsrc.xml
index 2f92e02..8baf198 100644
--- a/rdkv-extsrc.xml
+++ b/rdkv-extsrc.xml
@@ -5,11 +5,11 @@
     <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="nightly/20250107-kirkstone" sync-j="2"/>
     <include name="oe-layers.xml"/>
-    <project name="components/generic/rdk-oe/meta-cmf-video" path="meta-cmf-video" revision="rdk-next"/>
+    <project name="components/generic/rdk-oe/meta-cmf-video" path="meta-cmf-video"/>
     <project name="components/opensource/OMI"/>
-    <project name="components/opensource/RDK_apps" revision="rdk-next"/>
+    <project name="components/opensource/RDK_apps"/>
     <project name="components/opensource/dac-sec"/>
     <project name="components/opensource/gdbus-client"/>
     <project name="components/opensource/mabr-agent" path="components/generic/mabr-agent"/>
@@ -19,132 +19,132 @@
     <project name="components/opensource/waymetric"/>
     <project name="components/opensource/websocketclient"/>
     <project name="components/opensource/westeros"/>
-    <project name="devices/intel-x86-pc/rdkri/westeros" revision="rdk-next"/>
+    <project name="devices/intel-x86-pc/rdkri/westeros"/>
     <project name="meta-lts-mixins" remote="yocto" revision="1a4a2bb94f115ba240adbe53280f8ef71f5739d0" upstream="kirkstone/rust-1.70"/>
-    <project name="rdk/components/generic/WebconfigFramework" revision="rdk-next"/>
-    <project name="rdk/components/generic/aamp" revision="stable2"/>
-    <project name="rdk/components/generic/appmanager" revision="rdk-next"/>
-    <project name="rdk/components/generic/audiocapturemgr" revision="rdk-next"/>
-    <project name="rdk/components/generic/audioserver" revision="rdk-next"/>
-    <project name="rdk/components/generic/avs/alexa_skill_mapper" revision="rdk-next"/>
-    <project name="rdk/components/generic/avs/xr-speech-avs-sdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/blercudaemon" revision="rdk-next"/>
-    <project name="rdk/components/generic/bluetooth" revision="rdk-next"/>
-    <project name="rdk/components/generic/bluetooth_leAppMgr" revision="rdk-next"/>
-    <project name="rdk/components/generic/bluetooth_mgr" revision="rdk-next"/>
-    <project name="rdk/components/generic/breakpad_wrapper" revision="rdk-next"/>
+    <project name="rdk/components/generic/WebconfigFramework"/>
+    <project name="rdk/components/generic/aamp"/>
+    <project name="rdk/components/generic/appmanager"/>
+    <project name="rdk/components/generic/audiocapturemgr"/>
+    <project name="rdk/components/generic/audioserver"/>
+    <project name="rdk/components/generic/avs/alexa_skill_mapper"/>
+    <project name="rdk/components/generic/avs/xr-speech-avs-sdk"/>
+    <project name="rdk/components/generic/blercudaemon"/>
+    <project name="rdk/components/generic/bluetooth"/>
+    <project name="rdk/components/generic/bluetooth_leAppMgr"/>
+    <project name="rdk/components/generic/bluetooth_mgr"/>
+    <project name="rdk/components/generic/breakpad_wrapper"/>
     <project name="rdk/components/generic/cobalt-launcher"/>
-    <project name="rdk/components/generic/control" revision="rdk-next"/>
-    <project name="rdk/components/generic/cpuprocanalyzer" revision="rdk-next"/>
-    <project name="rdk/components/generic/crashlog" revision="rdk-next"/>
-    <project name="rdk/components/generic/crashupload" 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/devicesettings" revision="rdk-next"/>
-    <project name="rdk/components/generic/diagnostics" revision="rdk-next"/>
-    <project name="rdk/components/generic/dtcp" revision="rdk-next"/>
-    <project name="rdk/components/generic/ermgr" revision="rdk-next"/>
-    <project name="rdk/components/generic/gst-plugins-rdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/gst_svp_ext" revision="rdk-next"/>
-    <project name="rdk/components/generic/hdmicec" path="rdk/components/generic/hdmicecheader" revision="rdk-next"/>
-    <project name="rdk/components/generic/hdmicec" revision="rdk-next"/>
-    <project name="rdk/components/generic/hwselftest" revision="rdk-next"/>
-    <project name="rdk/components/generic/iarmbus" revision="rdk-next"/>
-    <project name="rdk/components/generic/iarmmgrs" path="rdk/components/generic/iarmmgrsheaders" revision="rdk-next"/>
-    <project name="rdk/components/generic/iarmmgrs" revision="rdk-next"/>
-    <project name="rdk/components/generic/injectedbundle" revision="rdk-next"/>
-    <project name="rdk/components/generic/jst" revision="rdk-next"/>
-    <project name="rdk/components/generic/ledmgr" revision="rdk-next"/>
-    <project name="rdk/components/generic/libSyscallWrapper" revision="rdk-next"/>
-    <project name="rdk/components/generic/libunpriv" revision="rdk-next"/>
-    <project name="rdk/components/generic/libusbctrl" revision="rdk-next"/>
+    <project name="rdk/components/generic/control"/>
+    <project name="rdk/components/generic/cpuprocanalyzer"/>
+    <project name="rdk/components/generic/crashlog"/>
+    <project name="rdk/components/generic/crashupload"/>
+    <project name="rdk/components/generic/dca"/>
+    <project name="rdk/components/generic/dcm"/>
+    <project name="rdk/components/generic/devicesettings"/>
+    <project name="rdk/components/generic/diagnostics"/>
+    <project name="rdk/components/generic/dtcp"/>
+    <project name="rdk/components/generic/ermgr"/>
+    <project name="rdk/components/generic/gst-plugins-rdk"/>
+    <project name="rdk/components/generic/gst_svp_ext"/>
+    <project name="rdk/components/generic/hdmicec" path="rdk/components/generic/hdmicecheader"/>
+    <project name="rdk/components/generic/hdmicec"/>
+    <project name="rdk/components/generic/hwselftest"/>
+    <project name="rdk/components/generic/iarmbus"/>
+    <project name="rdk/components/generic/iarmmgrs" path="rdk/components/generic/iarmmgrsheaders"/>
+    <project name="rdk/components/generic/iarmmgrs"/>
+    <project name="rdk/components/generic/injectedbundle"/>
+    <project name="rdk/components/generic/jst"/>
+    <project name="rdk/components/generic/ledmgr"/>
+    <project name="rdk/components/generic/libSyscallWrapper"/>
+    <project name="rdk/components/generic/libunpriv"/>
+    <project name="rdk/components/generic/libusbctrl"/>
     <project name="rdk/components/generic/lxc-container-generator"/>
     <project name="rdk/components/generic/lxccpid"/>
-    <project name="rdk/components/generic/media_utils" revision="rdk-next"/>
-    <project name="rdk/components/generic/mediaframework" revision="rdk-next"/>
-    <project name="rdk/components/generic/mfrlibs" revision="rdk-next"/>
-    <project name="rdk/components/generic/mocahal" revision="rdk-next"/>
-    <project name="rdk/components/generic/netmonitor" revision="rdk-next"/>
-    <project name="rdk/components/generic/netsrvmgr" 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-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-cobalt" path="meta-rdk-cobalt" 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/rdk-oe/meta-rdk-video" path="meta-rdk-video" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-voice-sdk" path="meta-rdk-voice-sdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk_logger" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdkapps" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdkat" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdkbrowser2" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdkmediaplayer" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdkssa" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdkversion" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdm" revision="rdk-next"/>
-    <project name="rdk/components/generic/rfc" revision="rdk-next"/>
-    <project name="rdk/components/generic/rmf_tools/generate_si_cache" revision="rdk-next"/>
-    <project name="rdk/components/generic/rmf_tools/tenableHDCP" revision="rdk-next"/>
-    <project name="rdk/components/generic/rne" revision="rdk-next"/>
-    <project name="rdk/components/generic/streamfs" revision="rdk-next"/>
-    <project name="rdk/components/generic/streamfs_fcc" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/analyzers/scripts/host" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/analyzers/scripts/target" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/hostdataconverter" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/iarm_event_sender" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/iarm_query_powerstate" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/iarm_set_powerstate" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/key_simulator" 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/mfr_data" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/mfr_utils" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/power-state-monitor" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/rdklogctrl" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/si_cache_parser" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/sys_resource" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/sys_utils" revision="rdk-next"/>
-    <project name="rdk/components/generic/sys_mon_tools/udhcpc-opt43" revision="rdk-next"/>
-    <project name="rdk/components/generic/syslog_helper" revision="rdk-next"/>
-    <project name="rdk/components/generic/telemetry" revision="rdk-next"/>
-    <project name="rdk/components/generic/tr69hostif" revision="rdk-next"/>
-    <project name="rdk/components/generic/trm" revision="rdk-next"/>
-    <project name="rdk/components/generic/ttsengine" revision="rdk-next"/>
-    <project name="rdk/components/generic/wifi" revision="rdk-next"/>
-    <project name="rdk/components/generic/xr-voice-sdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/xraudio-hal_ctrlm" revision="rdk-next"/>
-    <project name="rdk/components/generic/xupnp" revision="rdk-next"/>
-    <project name="rdk/components/opensource/gstreamer-direct-platform" revision="rdk-next"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="kirkstone"/>
+    <project name="rdk/components/generic/media_utils"/>
+    <project name="rdk/components/generic/mediaframework"/>
+    <project name="rdk/components/generic/mfrlibs"/>
+    <project name="rdk/components/generic/mocahal"/>
+    <project name="rdk/components/generic/netmonitor"/>
+    <project name="rdk/components/generic/netsrvmgr"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <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-cobalt" path="meta-rdk-cobalt"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-video" path="meta-rdk-video"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-voice-sdk" path="meta-rdk-voice-sdk"/>
+    <project name="rdk/components/generic/rdk_logger"/>
+    <project name="rdk/components/generic/rdkapps"/>
+    <project name="rdk/components/generic/rdkat"/>
+    <project name="rdk/components/generic/rdkbrowser2"/>
+    <project name="rdk/components/generic/rdkmediaplayer"/>
+    <project name="rdk/components/generic/rdkssa"/>
+    <project name="rdk/components/generic/rdkversion"/>
+    <project name="rdk/components/generic/rdm"/>
+    <project name="rdk/components/generic/rfc"/>
+    <project name="rdk/components/generic/rmf_tools/generate_si_cache"/>
+    <project name="rdk/components/generic/rmf_tools/tenableHDCP"/>
+    <project name="rdk/components/generic/rne"/>
+    <project name="rdk/components/generic/streamfs"/>
+    <project name="rdk/components/generic/streamfs_fcc"/>
+    <project name="rdk/components/generic/sys_mon_tools/analyzers/scripts/host"/>
+    <project name="rdk/components/generic/sys_mon_tools/analyzers/scripts/target"/>
+    <project name="rdk/components/generic/sys_mon_tools/hostdataconverter"/>
+    <project name="rdk/components/generic/sys_mon_tools/iarm_event_sender"/>
+    <project name="rdk/components/generic/sys_mon_tools/iarm_query_powerstate"/>
+    <project name="rdk/components/generic/sys_mon_tools/iarm_set_powerstate"/>
+    <project name="rdk/components/generic/sys_mon_tools/key_simulator"/>
+    <project name="rdk/components/generic/sys_mon_tools/mem_analyser_tools"/>
+    <project name="rdk/components/generic/sys_mon_tools/mfr_data"/>
+    <project name="rdk/components/generic/sys_mon_tools/mfr_utils"/>
+    <project name="rdk/components/generic/sys_mon_tools/power-state-monitor"/>
+    <project name="rdk/components/generic/sys_mon_tools/rdklogctrl"/>
+    <project name="rdk/components/generic/sys_mon_tools/si_cache_parser"/>
+    <project name="rdk/components/generic/sys_mon_tools/sys_resource"/>
+    <project name="rdk/components/generic/sys_mon_tools/sys_utils"/>
+    <project name="rdk/components/generic/sys_mon_tools/udhcpc-opt43"/>
+    <project name="rdk/components/generic/syslog_helper"/>
+    <project name="rdk/components/generic/telemetry"/>
+    <project name="rdk/components/generic/tr69hostif"/>
+    <project name="rdk/components/generic/trm"/>
+    <project name="rdk/components/generic/ttsengine"/>
+    <project name="rdk/components/generic/wifi"/>
+    <project name="rdk/components/generic/xr-voice-sdk"/>
+    <project name="rdk/components/generic/xraudio-hal_ctrlm"/>
+    <project name="rdk/components/generic/xupnp"/>
+    <project name="rdk/components/opensource/gstreamer-direct-platform"/>
+    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi"/>
     <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi" revision="rdk/morty"/>
-    <project name="rdk/components/opensource/sysint" revision="rdk-next"/>
-    <project name="rdk/components/opensource/tvsettings" revision="rdk-next"/>
-    <project name="rdk/components/opensource/tvsettings/stubs" revision="rdk-next"/>
-    <project name="rdk/devices/intel-x86-pc/emulator/devicesettings" revision="rdk-next"/>
-    <project name="rdk/devices/intel-x86-pc/emulator/iarmmgrs" revision="rdk-next"/>
-    <project name="rdk/devices/intel-x86-pc/rdkemulator/gst-plugins-rdk/playersinkbin" revision="rdk-next"/>
-    <project name="rdk/devices/intel-x86-pc/rdkemulator/gst-plugins-rdk/qamtunersrc" revision="rdk-next"/>
-    <project name="rdk/devices/intel-x86-pc/rdkemulator/mfrlibs" revision="rdk-next"/>
-    <project name="rdk/devices/intel-x86-pc/rdkemulator/tdk" path="rdkv/tools/tdkv/platform/emulator" revision="rdk-next"/>
-    <project name="rdk/devices/opensource/intel-x86-pc/emulator/sysint" path="rdk/components/opensource/sysint/device" revision="rdk-next"/>
-    <project name="rdk/devices/opensource/raspberrypi/sysint" path="rdk/components/opensource/sysint/devicerpi" revision="rdk-next"/>
-    <project name="rdk/devices/raspberrypi/devicesettings" revision="rdk-next"/>
-    <project name="rdk/devices/raspberrypi/gst-plugins-rdk/playersinkbin" revision="rdk-next"/>
-    <project name="rdk/devices/raspberrypi/iarmmgrs" revision="rdk-next"/>
-    <project name="rdk/devices/raspberrypi/mfrlibs" revision="rdk-next"/>
-    <project name="rdk/devices/raspberrypi/tdk" path="rdkv/tools/tdkv/platform/raspberrypi" revision="rdk-next"/>
-    <project name="rdk/devices/raspberrypi/webpa-client" revision="rdk-next"/>
-    <project name="rdkcentral/LISA" remote="github" path="components/opensource/LISA" revision="main"/>
+    <project name="rdk/components/opensource/sysint"/>
+    <project name="rdk/components/opensource/tvsettings"/>
+    <project name="rdk/components/opensource/tvsettings/stubs"/>
+    <project name="rdk/devices/intel-x86-pc/emulator/devicesettings"/>
+    <project name="rdk/devices/intel-x86-pc/emulator/iarmmgrs"/>
+    <project name="rdk/devices/intel-x86-pc/rdkemulator/gst-plugins-rdk/playersinkbin"/>
+    <project name="rdk/devices/intel-x86-pc/rdkemulator/gst-plugins-rdk/qamtunersrc"/>
+    <project name="rdk/devices/intel-x86-pc/rdkemulator/mfrlibs"/>
+    <project name="rdk/devices/intel-x86-pc/rdkemulator/tdk" path="rdkv/tools/tdkv/platform/emulator"/>
+    <project name="rdk/devices/opensource/intel-x86-pc/emulator/sysint" path="rdk/components/opensource/sysint/device"/>
+    <project name="rdk/devices/opensource/raspberrypi/sysint" path="rdk/components/opensource/sysint/devicerpi"/>
+    <project name="rdk/devices/raspberrypi/devicesettings"/>
+    <project name="rdk/devices/raspberrypi/gst-plugins-rdk/playersinkbin"/>
+    <project name="rdk/devices/raspberrypi/iarmmgrs"/>
+    <project name="rdk/devices/raspberrypi/mfrlibs"/>
+    <project name="rdk/devices/raspberrypi/tdk" path="rdkv/tools/tdkv/platform/raspberrypi"/>
+    <project name="rdk/devices/raspberrypi/webpa-client"/>
+    <project name="rdkcentral/LISA" remote="github" path="components/opensource/LISA"/>
     <project name="rdkcentral/RDKShell" remote="github" path="components/opensource/RDKShell"/>
-    <project name="rdkcentral/control-vendor-rdk" remote="github" path="rdk/components/generic/control/cpc" revision="main"/>
+    <project name="rdkcentral/control-vendor-rdk" remote="github" path="rdk/components/generic/control/cpc"/>
     <project name="rdkcentral/rdk-halif-deepsleep_manager" remote="github" path="rdk/components/generic/iarmmgrsheaders/deepsleepmgrheader" revision="cc3e71f4113ad66b2bee9d5d8276e668c471cbbd" upstream="main"/>
     <project name="rdkcentral/rdk-halif-hdmi_cec" remote="github" path="rdk/components/generic/hdmicecheader/hdmicecheader" revision="77ee8c1053f0b253cacd19343f439204775a69e7" upstream="main"/>
     <project name="rdkcentral/rdk-halif-power_manager" remote="github" path="rdk/components/generic/iarmmgrsheaders/pwrmgrheader" revision="960271decf177f86ed11e41071cdd69213278168" upstream="main"/>
     <project name="rdkcentral/rialto" remote="github" path="components/opensource/rialto"/>
     <project name="rdkcentral/rialto-gstreamer" remote="github" path="components/opensource/rialto-gstreamer"/>
     <project name="rdkcentral/rialto-ocdm" remote="github" path="components/opensource/rialto-ocdm"/>
-    <project name="rdkcentral/rtRemote" remote="github" path="components/opensource/rtRemote" revision="release"/>
-    <project name="rdkcentral/smartmon" remote="github" path="components/opensource/smartmon" revision="main"/>
+    <project name="rdkcentral/rtRemote" remote="github" path="components/opensource/rtRemote"/>
+    <project name="rdkcentral/smartmon" remote="github" path="components/opensource/smartmon"/>
     <project name="rdkcentral/tr69-datamodel" remote="github" path="components/generic/tr69/platform/devices" revision="refs/tags/v1.0.3" upstream="main"/>
     <project name="rdkcentral/tr69-datamodel" remote="github" path="rdk/components/generic/tr69hostif/tr69-datamodel" revision="refs/tags/v1.0.3" upstream="main"/>
-    <project name="rdkcentral/xdialserver" remote="github" path="components/opensource/xdialserver" revision="main"/>
-    <project name="rdkv/tools/tdkv" revision="rdk-next"/>
+    <project name="rdkcentral/xdialserver" remote="github" path="components/opensource/xdialserver"/>
+    <project name="rdkv/tools/tdkv"/>
 </manifest>

rdkv-nosrc.xml

diff --git a/rdkv-nosrc.xml b/rdkv-nosrc.xml
index 7b64c75..444b0b4 100644
--- a/rdkv-nosrc.xml
+++ b/rdkv-nosrc.xml
@@ -5,17 +5,17 @@
     <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="nightly/20250107-kirkstone" sync-j="2"/>
     <include name="oe-layers.xml"/>
-    <project name="components/generic/rdk-oe/meta-cmf-video" path="meta-cmf-video" revision="rdk-next"/>
+    <project name="components/generic/rdk-oe/meta-cmf-video" path="meta-cmf-video"/>
     <project name="meta-lts-mixins" remote="yocto" revision="1a4a2bb94f115ba240adbe53280f8ef71f5739d0" upstream="kirkstone/rust-1.70"/>
-    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf" 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-cobalt" path="meta-rdk-cobalt" 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/rdk-oe/meta-rdk-video" path="meta-rdk-video" revision="rdk-next"/>
-    <project name="rdk/components/generic/rdk-oe/meta-rdk-voice-sdk" path="meta-rdk-voice-sdk" revision="rdk-next"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="kirkstone"/>
+    <project name="rdk/components/generic/rdk-oe/meta-cmf" path="meta-cmf"/>
+    <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-cobalt" path="meta-rdk-cobalt"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-ext" path="meta-rdk-ext"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-video" path="meta-rdk-video"/>
+    <project name="rdk/components/generic/rdk-oe/meta-rdk-voice-sdk" path="meta-rdk-voice-sdk"/>
+    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi"/>
     <project name="rdk/components/opensource/oe/meta-rtlwifi" path="meta-rtlwifi" revision="rdk/morty"/>
 </manifest>