diff --git a/conf/bblayers-bsp.inc b/conf/bblayers-bsp.inc
index 5bd9664..7648793 100644
--- a/conf/bblayers-bsp.inc
+++ b/conf/bblayers-bsp.inc
@@ -16,5 +16,7 @@ BSPLAYERS = " \
   ${OEROOT}/layers/meta-yocto/meta-yocto-bsp \
   ${OEROOT}/layers/meta-xilinx/meta-xilinx-bsp \
   ${OEROOT}/layers/meta-xilinx-tools \
+  ${OEROOT}/layers/meta-ti \
+  ${OEROOT}/layers/meta-st-stm32mp \
   ${OEROOT}/layers/meta-lmp/meta-lmp-bsp \
 "
diff --git a/conf/bblayers.conf b/conf/bblayers.conf
index 8fb353a..e7c4e01 100644
--- a/conf/bblayers.conf
+++ b/conf/bblayers.conf
@@ -26,5 +26,5 @@ BBLAYERS += " \
              ${OEROOT}/layers/meta-rust \
              ${OEROOT}/layers/meta-parsec \
              ${OEROOT}/layers/meta-yocto/meta-poky/ \
-             ${OEROOT}/layers/meta-arm/meta-arm-autonomy \
+             ${OEROOT}/layers/meta-pelion-edge/meta-imx8mmsolidrun-support \
             "
diff --git a/conf/local.conf b/conf/local.conf
index 9176188..4e126c4 100644
--- a/conf/local.conf
+++ b/conf/local.conf
@@ -88,17 +88,21 @@ ACCEPT_FSL_EULA = "1"
 # Not sure if this is required
 #INHIBIT_SYSROOT_STRIP = "1"
 
-DISTRO_FEATURES = "ext2 opengl usbhost ${DISTRO_FEATURES_LIBC} virtualization k8s"
-GOVERSION = "1.14%"
+DISTRO_FEATURES = "ipv4 ipv6 ext2 opengl usbhost virtualization k8s wifi"
+GOVERSION = "1.15%"
 
 #Enables serial console for raspberry pi
 ENABLE_SERIAL_CONSOLE = "1"
 
+# Uncomment following line to get pc-ble-driver into image.
+# IMAGE_INSTALL_append = " pc-ble-driver"
+
 # edge-kubelet is a modified version of Kubernetes' kubelet to enable kubelet interact with the Pelion cloud services
 PREFERRED_RPROVIDER_kubelet = "kubelet"
 
-WKS_FILES_uz = "sdimage-uz-sota-config.wks.in"
-
 # if persistent /var/log is desired, set the following to "no"
 # persistent logging is required to enable Journald's Forware Secure Sealing (FSS) feature
 VOLATILE_LOG_DIR = "no"
+
+# Set default Pelion image name to mfg tool
+MFGTOOL_FLASH_IMAGE = "console-image-lmp"
\ No newline at end of file
diff --git a/lmp-base.xml b/lmp-base.xml
index d9692c6..7d3b958 100644
--- a/lmp-base.xml
+++ b/lmp-base.xml
@@ -9,11 +9,11 @@
   <project name="lmp-tools" path="tools/lmp-tools" remote="fio">
     <linkfile dest="setup-environment" src="setup-environment"/>
   </project>
-  <project name="meta-lmp" path="layers/meta-lmp" remote="fio" revision="b70cd394819915752d3ce7c066dafff75d9126cd"/>
+  <project name="meta-lmp" path="layers/meta-lmp" remote="fio" revision="6f40b3f448589dae2b49476f52e736327074ad6c"/>
   <project name="meta-clang" path="layers/meta-clang" revision="04a1194c78563524659f27941304e564956792b1"/>
   <project name="meta-openembedded" path="layers/meta-openembedded" revision="945f062ff098dc9c8ba8d22c5eef88adec60730d"/>
-  <project name="meta-security" path="layers/meta-security" revision="adcd7c43717274e6274a98133db5c2a4314dac97"/>
+  <project name="meta-security" path="layers/meta-security" revision="3daf99fd138b0eebe864bbe1b9c71241d97c4512"/>
   <project name="meta-updater" path="layers/meta-updater" revision="070d291c0e79f58f2c23ef43740ea77fe2d952a6"/>
-  <project name="meta-virtualization" path="layers/meta-virtualization" revision="a4439b76db06bdd747c6765ec184a76f6ec18e88"/>
-  <project name="openembedded-core" path="layers/openembedded-core" revision="f74d1ea0189d7d6608ab90ea9a111d641bb417fd"/>
+  <project name="meta-virtualization" path="layers/meta-virtualization" revision="55ccbab52ec77d8cd923e16cad17605b14fd8036"/>
+  <project name="openembedded-core" path="layers/openembedded-core" revision="431dae3ff30b162b8a63344f559601e590f64a54"/>
 </manifest>
diff --git a/lmp-bsp.xml b/lmp-bsp.xml
index 12ed450..3b66147 100644
--- a/lmp-bsp.xml
+++ b/lmp-bsp.xml
@@ -4,14 +4,16 @@
 
   <default remote="lmp-mirrors" revision="master" sync-j="4"/>
 
-  <project name="meta-arm" path="layers/meta-arm" revision="ac9f59ca6277f88f2714ed2c14e8f3c33bc47f4a"/>
-  <project name="meta-freescale" path="layers/meta-freescale" revision="d05c5c6654a64188422f88cdc82b6b97610d5591"/>
-  <project name="meta-freescale-3rdparty" path="layers/meta-freescale-3rdparty" revision="b6da6dd9ce80db442cbc8737641f3ee54ee98312"/>
-  <project name="meta-intel" path="layers/meta-intel" revision="8e72e716c96d3480c3e1cf2096a8e64c51b9f24b"/>
-  <project name="meta-raspberrypi" path="layers/meta-raspberrypi" revision="09a3c11696c75593f8e475da5dfb401016c6aaca"/>
+  <project name="meta-arm" path="layers/meta-arm" revision="d8074cb6a02eebb14a22595513a0df3469a5d425"/>
+  <project name="meta-freescale" path="layers/meta-freescale" revision="1acf098972f9f86b26eee815827667dbd2fcdeaf"/>
+  <project name="meta-freescale-3rdparty" path="layers/meta-freescale-3rdparty" revision="efef93a0dc5be90c5bdc81dae252516887c95586"/>
+  <project name="meta-intel" path="layers/meta-intel" revision="76e0a427e58d068d0758fa052d2d1548067cf592"/>
+  <project name="meta-raspberrypi" path="layers/meta-raspberrypi" revision="3ae135e590e375c8da26b003bda41c18fb977ae1"/>
   <project name="meta-riscv" path="layers/meta-riscv" revision="b022614bc4a2ddc744ab976d87295758710382d2"/>
   <project name="meta-rtlwifi" path="layers/meta-rtlwifi" revision="ccf8cdc0e2282cf3989d35504989dc404bbe1370"/>
+  <project name="meta-st-stm32mp" path="layers/meta-st-stm32mp" revision="1a1f35012f69d1073440a81dc8e747f1380f30cf"/>
   <project name="meta-yocto" path="layers/meta-yocto" revision="ac4a956f606d9cb4e025af80e6f4dcb74cbfd941"/>
   <project name="meta-xilinx" path="layers/meta-xilinx" revision="eb4ba06eb1bc7743dba2412b0c903ec5d5628cae"/>
   <project name="meta-xilinx-tools" path="layers/meta-xilinx-tools" revision="37e0988018e95cdcf2684a77d4e9e8cd5610ccaf"/>
+  <project name="meta-ti" path="layers/meta-ti" revision="9ad8bc7fa3828dd9a48336e6847b782ac7018cf6"/>
 </manifest>
diff --git a/pelion.xml b/pelion.xml
index 26cff0e..e426511 100644
--- a/pelion.xml
+++ b/pelion.xml
@@ -10,12 +10,12 @@
   <project name="meta-mbed-edge"
            path="layers/meta-mbed-edge"
            remote="PelionIoT"
-           revision="refs/tags/2.3.0" />
+           revision="e1941de4f3a6f685d3047ee2f5e37b7824cb15e8" />
 
   <project name="meta-pelion-edge"
            path="layers/meta-pelion-edge"
            remote="PelionIoT"
-           revision="refs/tags/2.3.0" />
+           revision="0e01e9beb95ddae237681c5cba3db75a059d4d42" />
 
   <project name="meta-rust/meta-rust"
            path="layers/meta-rust"
@@ -25,5 +25,5 @@
   <project name="meta-parsec"
            path="layers/meta-parsec"
            remote="PelionIoT"
-           revision="337ca136c6ac785433ccec56fa1cacbe956049b0" />
+           revision="9d1e2386c8e499f735e92d5d9b5b1b33d8b2f732" />
 </manifest>