Update manifests to use feature-apparmor-refactor branch
diff --git a/oe-layers.xml b/oe-layers.xml
index 03e2abf..259a23a 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="1.46"/>
-    <project name="rdk/components/opensource/oe/meta-gplv2" path="meta-gplv2" revision="dunfell"/>
-    <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/dunfell"/>
-    <project name="rdk/components/opensource/oe/meta-python2" path="meta-python2" revision="dunfell"/>
-    <project name="rdk/components/opensource/oe/meta-virtualization" path="meta-virtualization" revision="dunfell"/>
-    <project name="rdk/components/opensource/oe/openembedded-core" path="openembedded-core" revision="rdk/dunfell"/>
+    <project name="rdk/components/opensource/oe/bitbake" path="openembedded-core/bitbake" revision="feature-apparmor-refactor"/>
+    <project name="rdk/components/opensource/oe/meta-gplv2" path="meta-gplv2" revision="feature-apparmor-refactor"/>
+    <project name="rdk/components/opensource/oe/meta-jz-mips" path="meta-jz-mips" revision="feature-apparmor-refactor"/>
+    <project name="rdk/components/opensource/oe/meta-openembedded" path="meta-openembedded" revision="feature-apparmor-refactor"/>
+    <project name="rdk/components/opensource/oe/meta-python2" path="meta-python2" revision="feature-apparmor-refactor"/>
+    <project name="rdk/components/opensource/oe/meta-virtualization" path="meta-virtualization" revision="feature-apparmor-refactor"/>
+    <project name="rdk/components/opensource/oe/openembedded-core" path="openembedded-core" revision="feature-apparmor-refactor"/>
 </manifest>
diff --git a/rdkv-extsrc.xml b/rdkv-extsrc.xml
index 69efe20..2bee274 100644
--- a/rdkv-extsrc.xml
+++ b/rdkv-extsrc.xml
@@ -5,162 +5,162 @@
     <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-apparmor-refactor" sync-j="2"/>
     <include name="oe-layers.xml"/>
-    <project name="components/generic/rdk-oe/meta-cmf-qt5" path="meta-cmf-qt5" 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-cmf-qt5" path="meta-cmf-qt5"/>
+    <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"/>
-    <project name="components/opensource/patches/qtbase-5.1.1" path="meta-cmf-qt5/recipes-qt/qt5/qtbase-5.1.1" revision="rdk-next"/>
-    <project name="components/opensource/patches/qtwebsockets-0.9.0" path="meta-cmf-qt5/recipes-qt/qt5/qtwebsockets-5.1.1" revision="rdk-next"/>
+    <project name="components/opensource/patches/qtbase-5.1.1" path="meta-cmf-qt5/recipes-qt/qt5/qtbase-5.1.1"/>
+    <project name="components/opensource/patches/qtwebsockets-0.9.0" path="meta-cmf-qt5/recipes-qt/qt5/qtwebsockets-5.1.1"/>
     <project name="components/opensource/rpcserver"/>
     <project name="components/opensource/v4l2test"/>
     <project name="components/opensource/wayland-egl-icegdl"/>
     <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-rust/meta-rust" remote="github" path="meta-rust" revision="1ed669c464a113cddba8222b419565273d3410f2" upstream="master"/>
-    <project name="rdk/components/generic/WebconfigFramework" revision="rdk-next"/>
-    <project name="rdk/components/generic/aamp" revision="stable2"/>
-    <project name="rdk/components/generic/aampabr" revision="stable2"/>
-    <project name="rdk/components/generic/aampmetrics" 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/aampabr"/>
+    <project name="rdk/components/generic/aampmetrics"/>
+    <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"/>
     <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-plugins-rdk-aamp" revision="stable2"/>
-    <project name="rdk/components/generic/gst_svp_ext" 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" 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-plugins-rdk-aamp"/>
+    <project name="rdk/components/generic/gst_svp_ext"/>
+    <project name="rdk/components/generic/hdmicec"/>
+    <project name="rdk/components/generic/hwselftest"/>
+    <project name="rdk/components/generic/iarmbus"/>
+    <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/rdkx_logger" 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-fdc" revision="rdk-next"/>
-    <project name="rdk/components/generic/xr-speech-router" revision="rdk-next"/>
-    <project name="rdk/components/generic/xr-speech-vrex" revision="rdk-next"/>
-    <project name="rdk/components/generic/xr-timer" revision="rdk-next"/>
-    <project name="rdk/components/generic/xr-timestamp" revision="rdk-next"/>
-    <project name="rdk/components/generic/xr-voice-sdk" revision="rdk-next"/>
-    <project name="rdk/components/generic/xr_atomic" revision="rdk-next"/>
-    <project name="rdk/components/generic/xr_mq" revision="rdk-next"/>
-    <project name="rdk/components/generic/xraudio" revision="rdk-next"/>
-    <project name="rdk/components/generic/xraudio-adpcm" revision="rdk-next"/>
-    <project name="rdk/components/generic/xraudio-hal_ctrlm" revision="rdk-next"/>
-    <project name="rdk/components/generic/xraudio-opus" revision="rdk-next"/>
-    <project name="rdk/components/generic/xraudio-utils" revision="rdk-next"/>
-    <project name="rdk/components/generic/xrpSMEngine" 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/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/rdkx_logger"/>
+    <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-fdc"/>
+    <project name="rdk/components/generic/xr-speech-router"/>
+    <project name="rdk/components/generic/xr-speech-vrex"/>
+    <project name="rdk/components/generic/xr-timer"/>
+    <project name="rdk/components/generic/xr-timestamp"/>
+    <project name="rdk/components/generic/xr-voice-sdk"/>
+    <project name="rdk/components/generic/xr_atomic"/>
+    <project name="rdk/components/generic/xr_mq"/>
+    <project name="rdk/components/generic/xraudio"/>
+    <project name="rdk/components/generic/xraudio-adpcm"/>
+    <project name="rdk/components/generic/xraudio-hal_ctrlm"/>
+    <project name="rdk/components/generic/xraudio-opus"/>
+    <project name="rdk/components/generic/xraudio-utils"/>
+    <project name="rdk/components/generic/xrpSMEngine"/>
+    <project name="rdk/components/generic/xupnp"/>
+    <project name="rdk/components/opensource/gstreamer-direct-platform"/>
     <project name="rdk/components/opensource/oe/meta-qt5" path="meta-qt5" revision="rdk/morty"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="dunfell"/>
+    <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/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/tr69-datamodel" remote="github" path="components/generic/tr69/platform/devices" revision="main"/>
-    <project name="rdkcentral/tr69-datamodel" remote="github" path="rdk/components/generic/tr69hostif/tr69-datamodel" revision="main"/>
-    <project name="rdkcentral/xdialserver" remote="github" path="components/opensource/xdialserver" revision="main"/>
-    <project name="rdkv/tools/tdkv" revision="rdk-next"/>
+    <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"/>
+    <project name="rdkcentral/tr69-datamodel" remote="github" path="rdk/components/generic/tr69hostif/tr69-datamodel"/>
+    <project name="rdkcentral/xdialserver" remote="github" path="components/opensource/xdialserver"/>
+    <project name="rdkv/tools/tdkv"/>
 </manifest>
diff --git a/rdkv-nosrc.xml b/rdkv-nosrc.xml
index d57e374..7eea8c2 100644
--- a/rdkv-nosrc.xml
+++ b/rdkv-nosrc.xml
@@ -5,21 +5,21 @@
     <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-apparmor-refactor" sync-j="2"/>
     <include name="oe-layers.xml"/>
-    <project name="components/generic/rdk-oe/meta-cmf-qt5" path="meta-cmf-qt5" revision="rdk-next"/>
-    <project name="components/generic/rdk-oe/meta-cmf-video" path="meta-cmf-video" revision="rdk-next"/>
-    <project name="components/opensource/patches/qtbase-5.1.1" path="meta-cmf-qt5/recipes-qt/qt5/qtbase-5.1.1" revision="rdk-next"/>
-    <project name="components/opensource/patches/qtwebsockets-0.9.0" path="meta-cmf-qt5/recipes-qt/qt5/qtwebsockets-5.1.1" revision="rdk-next"/>
+    <project name="components/generic/rdk-oe/meta-cmf-qt5" path="meta-cmf-qt5"/>
+    <project name="components/generic/rdk-oe/meta-cmf-video" path="meta-cmf-video"/>
+    <project name="components/opensource/patches/qtbase-5.1.1" path="meta-cmf-qt5/recipes-qt/qt5/qtbase-5.1.1"/>
+    <project name="components/opensource/patches/qtwebsockets-0.9.0" path="meta-cmf-qt5/recipes-qt/qt5/qtwebsockets-5.1.1"/>
     <project name="meta-rust/meta-rust" remote="github" path="meta-rust" revision="1ed669c464a113cddba8222b419565273d3410f2" upstream="master"/>
-    <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-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-qt5" path="meta-qt5" revision="rdk/morty"/>
-    <project name="rdk/components/opensource/oe/meta-raspberrypi" path="meta-raspberrypi" revision="dunfell"/>
+    <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>